[sldev-commits] r2292 - in branches/render-pipeline: doc indra/llcommon indra/newview indra/newview/English.lproj indra/newview/app_settings/shaders/class3/deferred indra/newview/mozilla-theme indra/newview/res

cg.linden at svn.secondlife.com cg.linden at svn.secondlife.com
Tue May 19 18:08:05 PDT 2009


Author: cg.linden
Date: 2009-05-19 20:08:05 -0500 (Tue, 19 May 2009)
New Revision: 2292

Added:
   branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/avatarF.glsl
Modified:
   branches/render-pipeline/doc/asset_urls.txt
   branches/render-pipeline/indra/llcommon/llversionserver.h
   branches/render-pipeline/indra/llcommon/llversionviewer.h
   branches/render-pipeline/indra/newview/English.lproj/InfoPlist.strings
   branches/render-pipeline/indra/newview/Info-SecondLife.plist
   branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/postDeferredF.glsl
   branches/render-pipeline/indra/newview/mozilla-theme/classic.manifest
   branches/render-pipeline/indra/newview/pipeline.cpp
   branches/render-pipeline/indra/newview/res/viewerRes.rc
Trac: http://svn.secondlife.com/trac/linden/changeset/2292
Log:
Snapshot of internal branch render-pipeline
Internal URL: http://svn.lindenlab.com/svn/linden/branches/render-pipeline/render-pipeline-1
Revision Range: 120956 to 120956

Supplementary files:
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/md5sums-render-pipeline-1.23.0.120956.txt
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-artwork-render-pipeline-1.23.0.120956.zip
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-darwin-libs--1.23.0.120956.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-darwin-libs-render-pipeline-1.23.0.120956.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-linux-libs--1.23.0.120956.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-linux-libs-render-pipeline-1.23.0.120956.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-win32-libs-render-pipeline-1.23.0.120956.zip
Source tarballs - redundant to this svn:
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-src-render-pipeline-1.23.0.120956.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-src-render-pipeline-1.23.0.120956.zip


Modified: branches/render-pipeline/doc/asset_urls.txt
===================================================================
--- branches/render-pipeline/doc/asset_urls.txt	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/doc/asset_urls.txt	2009-05-20 01:08:05 UTC (rev 2292)
@@ -1,5 +1,7 @@
-SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/md5sums-render-pipeline-1.23.0.120560.txt
-SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-artwork-render-pipeline-1.23.0.120560.zip
-SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-darwin-libs-render-pipeline-1.23.0.120560.tar.gz
-SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-linux-libs-render-pipeline-1.23.0.120560.tar.gz
-SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-win32-libs-render-pipeline-1.23.0.120560.zip
+SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/md5sums-render-pipeline-1.23.0.120956.txt
+SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-artwork-render-pipeline-1.23.0.120956.zip
+SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-darwin-libs--1.23.0.120956.tar.gz
+SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-darwin-libs-render-pipeline-1.23.0.120956.tar.gz
+SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-linux-libs--1.23.0.120956.tar.gz
+SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-linux-libs-render-pipeline-1.23.0.120956.tar.gz
+SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/05/render-pipeline/slviewer-win32-libs-render-pipeline-1.23.0.120956.zip

Modified: branches/render-pipeline/indra/llcommon/llversionserver.h
===================================================================
--- branches/render-pipeline/indra/llcommon/llversionserver.h	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/llcommon/llversionserver.h	2009-05-20 01:08:05 UTC (rev 2292)
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 27;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 120560;
+const S32 LL_VERSION_BUILD = 120956;
 
 const char * const LL_CHANNEL = "Second Life Server";
 

Modified: branches/render-pipeline/indra/llcommon/llversionviewer.h
===================================================================
--- branches/render-pipeline/indra/llcommon/llversionviewer.h	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/llcommon/llversionviewer.h	2009-05-20 01:08:05 UTC (rev 2292)
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 23;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 120560;
+const S32 LL_VERSION_BUILD = 120956;
 
 const char * const LL_CHANNEL = "Second Life Release";
 

Modified: branches/render-pipeline/indra/newview/English.lproj/InfoPlist.strings
===================================================================
--- branches/render-pipeline/indra/newview/English.lproj/InfoPlist.strings	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/newview/English.lproj/InfoPlist.strings	2009-05-20 01:08:05 UTC (rev 2292)
@@ -1,7 +1,7 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "Second Life";
-
-CFBundleShortVersionString = "Second Life version 1.23.0.120560";
-CFBundleGetInfoString = "Second Life version 1.23.0.120560, Copyright 2004-2008 Linden Research, Inc.";
-
+/* Localized versions of Info.plist keys */
+
+CFBundleName = "Second Life";
+
+CFBundleShortVersionString = "Second Life version 1.23.0.120956";
+CFBundleGetInfoString = "Second Life version 1.23.0.120956, Copyright 2004-2008 Linden Research, Inc.";
+

Modified: branches/render-pipeline/indra/newview/Info-SecondLife.plist
===================================================================
--- branches/render-pipeline/indra/newview/Info-SecondLife.plist	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/newview/Info-SecondLife.plist	2009-05-20 01:08:05 UTC (rev 2292)
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Second Life</string>
-	<key>CFBundleIconFile</key>
-	<string>secondlife.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.viewer</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Second Life</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Second Life URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>secondlife</string>
-			</array>
-			<key>LSIsAppleDefaultForScheme</key>
-			<true/>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.23.0.120560</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Second Life</string>
+	<key>CFBundleIconFile</key>
+	<string>secondlife.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.secondlife.indra.viewer</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Second Life</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Second Life URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>secondlife</string>
+			</array>
+			<key>LSIsAppleDefaultForScheme</key>
+			<true/>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.23.0.120956</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>

Added: branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/avatarF.glsl
===================================================================
--- branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/avatarF.glsl	                        (rev 0)
+++ branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/avatarF.glsl	2009-05-20 01:08:05 UTC (rev 2292)
@@ -0,0 +1,18 @@
+/** 
+ * @file avatarF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+uniform sampler2D diffuseMap;
+
+varying vec3 vary_normal;
+
+void main() 
+{
+	gl_FragData[0] = vec4(gl_Color.rgb * texture2D(diffuseMap, gl_TexCoord[0].xy).rgb, 0.0);
+	gl_FragData[1] = vec4(0,0,0,0);
+	gl_FragData[2] = vec4(normalize(vary_normal)*0.5+0.5, 0.0);
+}
+

Modified: branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/postDeferredF.glsl
===================================================================
--- branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/postDeferredF.glsl	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/newview/app_settings/shaders/class3/deferred/postDeferredF.glsl	2009-05-20 01:08:05 UTC (rev 2292)
@@ -38,9 +38,20 @@
 	
 	float ambocc = texture2DRect(lightMap, vary_fragcoord.xy).g;
 			
-	vec3 gi_col = texture2DRect(giLightMap, vary_fragcoord.xy).rgb;
+	vec3 ccol = texture2DRect(giLightMap, vary_fragcoord.xy).rgb;
+	vec3 gi_col = vec3(0.0);
+	for (int i = -2; i <= 2; i+=1)
+	{
+		for (int j = -1; j <= 2; j+=1)
+		{
+			vec2 tc = vec2(i,j);
+			float wght = 1.0/(length(tc)+1.0);
+			gi_col += texture2DRect(giLightMap, vary_fragcoord.xy+vec2(i,j)).rgb * wght;
+		}
+	}
+	
 	//gi_col *= 1.0+spec.a*4.0;
-	gi_col = (gi_col*gi_col*gi_quad.x + gi_col*gi_quad.y)*(diff.rgb+spec.rgb*spec.a)+gi_quad.z*ambocc*ambient.rgb*diff.rgb;
+	gi_col = (sqrt(gi_col)*gi_quad.x + gi_col*gi_quad.y)*(diff.rgb+spec.rgb*spec.a)+gi_quad.z*ambocc*ambient.rgb*diff.rgb;
 	
 	vec4 sun_col =	texture2DRect(sunLightMap, vary_fragcoord.xy);
 	

Modified: branches/render-pipeline/indra/newview/mozilla-theme/classic.manifest
===================================================================
--- branches/render-pipeline/indra/newview/mozilla-theme/classic.manifest	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/newview/mozilla-theme/classic.manifest	2009-05-20 01:08:05 UTC (rev 2292)
@@ -1,4 +1,4 @@
-skin communicator classic/1.0 jar:classic.jar!/skin/classic/communicator/
-skin global classic/1.0 jar:classic.jar!/skin/classic/global/
-skin mozapps classic/1.0 jar:classic.jar!/skin/classic/mozapps/
-skin help classic/1.0 jar:classic.jar!/skin/classic/help/
+skin communicator classic/1.0 jar:classic.jar!/skin/classic/communicator/
+skin global classic/1.0 jar:classic.jar!/skin/classic/global/
+skin mozapps classic/1.0 jar:classic.jar!/skin/classic/mozapps/
+skin help classic/1.0 jar:classic.jar!/skin/classic/help/

Modified: branches/render-pipeline/indra/newview/pipeline.cpp
===================================================================
--- branches/render-pipeline/indra/newview/pipeline.cpp	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/newview/pipeline.cpp	2009-05-20 01:08:05 UTC (rev 2292)
@@ -6208,10 +6208,10 @@
 
 				LLVector2 gauss[32]; // xweight, yweight, offset
 
-				F32 sc = 1.f/(i+1);
+				F32 sc = 1.f;
 
 				F32 go = gSavedSettings.getF32("RenderGIGaussian");
-				U32 kern_length = llclamp(gSavedSettings.getU32("RenderGIBlurSamples")/(i+1), (U32) 1, (U32) 16)*2 - 1;
+				U32 kern_length = llclamp(gSavedSettings.getU32("RenderGIBlurSamples"), (U32) 1, (U32) 16)*2 - 1;
 				F32 blur_size = gSavedSettings.getF32("RenderGIBlurSize")*sc;
 				F32 dist_factor = gSavedSettings.getF32("RenderGIBlurDistFactor");
 

Modified: branches/render-pipeline/indra/newview/res/viewerRes.rc
===================================================================
--- branches/render-pipeline/indra/newview/res/viewerRes.rc	2009-05-20 00:54:02 UTC (rev 2291)
+++ branches/render-pipeline/indra/newview/res/viewerRes.rc	2009-05-20 01:08:05 UTC (rev 2292)
@@ -1,193 +1,193 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC (-1)
-#include "winresrc.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-// Commented out because it only compiles if you have MFC installed.
-//#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_LL_ICON             ICON                    "ll_icon.ico"
-IDI_LCD_LL_ICON         ICON                    "icon1.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-SPLASHSCREEN DIALOG  32, 32, 144, 34
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
-    LTEXT           "Loading Second Life...",666,36,13,91,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-
-    "SPLASHSCREEN", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 137
-        VERTGUIDE, 36
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 27
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-TOOLGRAB                CURSOR                  "lltoolgrab.cur"
-TOOLLAND                CURSOR                  "lltoolland.cur"
-TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"
-TOOLCREATE              CURSOR                  "lltoolcreate.cur"
-ARROWDRAG               CURSOR                  "llarrowdrag.cur"
-ARROW                   CURSOR                  "llarrow.cur"
-NOLOCKED                CURSOR                  "llnolocked.cur"
-ARROWLOCKED             CURSOR                  "llarrowlocked.cur"
-GRABLOCKED              CURSOR                  "llgrablocked.cur"
-TOOLROTATE              CURSOR                  "lltoolrotate.cur"
-TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"
-TOOLSCALE               CURSOR                  "lltoolscale.cur"
-TOOLCAMERA              CURSOR                  "lltoolcamera.cur"
-TOOLPAN                 CURSOR                  "lltoolpan.cur"
-TOOLFOCUS               CURSOR                  "lltoolfocus.cur"
-TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"
-ARROWCOPY               CURSOR                  "arrowcop.cur"
-ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"
-ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"
-TOOLSIT                 CURSOR                  "toolsit.cur"
-TOOLBUY                 CURSOR                  "toolbuy.cur"
-TOOLPAY                 CURSOR                  "toolpay.cur"
-TOOLOPEN                CURSOR                  "toolopen.cur"
-TOOLPIPETTE             CURSOR                  "toolpipette.cur"
-TOOLPLAY                CURSOR                  "toolplay.cur"
-TOOLPAUSE               CURSOR                  "toolpause.cur"
-TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,23,0,120560
- PRODUCTVERSION 1,23,0,120560
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Linden Lab"
-            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.23.0.120560"
-            VALUE "InternalName", "Second Life"
-            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
-            VALUE "OriginalFilename", "SecondLife.exe"
-            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.23.0.120560"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC (-1)
+#include "winresrc.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+// Commented out because it only compiles if you have MFC installed.
+//#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_LL_ICON             ICON                    "ll_icon.ico"
+IDI_LCD_LL_ICON         ICON                    "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+SPLASHSCREEN DIALOG  32, 32, 144, 34
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
+FONT 8, "MS Sans Serif"
+BEGIN
+    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
+    LTEXT           "Loading Second Life...",666,36,13,91,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+
+    "SPLASHSCREEN", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 137
+        VERTGUIDE, 36
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 27
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+TOOLGRAB                CURSOR                  "lltoolgrab.cur"
+TOOLLAND                CURSOR                  "lltoolland.cur"
+TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"
+TOOLCREATE              CURSOR                  "lltoolcreate.cur"
+ARROWDRAG               CURSOR                  "llarrowdrag.cur"
+ARROW                   CURSOR                  "llarrow.cur"
+NOLOCKED                CURSOR                  "llnolocked.cur"
+ARROWLOCKED             CURSOR                  "llarrowlocked.cur"
+GRABLOCKED              CURSOR                  "llgrablocked.cur"
+TOOLROTATE              CURSOR                  "lltoolrotate.cur"
+TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"
+TOOLSCALE               CURSOR                  "lltoolscale.cur"
+TOOLCAMERA              CURSOR                  "lltoolcamera.cur"
+TOOLPAN                 CURSOR                  "lltoolpan.cur"
+TOOLFOCUS               CURSOR                  "lltoolfocus.cur"
+TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"
+ARROWCOPY               CURSOR                  "arrowcop.cur"
+ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"
+ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"
+TOOLSIT                 CURSOR                  "toolsit.cur"
+TOOLBUY                 CURSOR                  "toolbuy.cur"
+TOOLPAY                 CURSOR                  "toolpay.cur"
+TOOLOPEN                CURSOR                  "toolopen.cur"
+TOOLPIPETTE             CURSOR                  "toolpipette.cur"
+TOOLPLAY                CURSOR                  "toolplay.cur"
+TOOLPAUSE               CURSOR                  "toolpause.cur"
+TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,23,0,120956
+ PRODUCTVERSION 1,23,0,120956
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Linden Lab"
+            VALUE "FileDescription", "Second Life"
+            VALUE "FileVersion", "1.23.0.120956"
+            VALUE "InternalName", "Second Life"
+            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
+            VALUE "OriginalFilename", "SecondLife.exe"
+            VALUE "ProductName", "Second Life"
+            VALUE "ProductVersion", "1.23.0.120956"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+



More information about the sldev-commits mailing list