Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tag, settings

Browse Source
This commit is contained in:
siana
2010-12-26 01:53:36 +01:00
parent bc0e5d29a5
commit 784ef47048
8 changed files with 15293 additions and 16474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/cmake/00-Common.cmake
View File

@@ -35,13 +35,13 @@ if (WINDOWS)
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP" "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
CACHE STRING "C++ compiler release-with-debug options" FORCE) CACHE STRING "C++ compiler release-with-debug options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP" "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /fp:fast"
CACHE STRING "C++ compiler release options" FORCE) CACHE STRING "C++ compiler release options" FORCE)
set(CMAKE_CXX_FLAGS_RELEASESSE2 set(CMAKE_CXX_FLAGS_RELEASESSE2
"${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2" "${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
CACHE STRING "C++ compiler release-SSE2 options" FORCE) CACHE STRING "C++ compiler release-SSE2 options" FORCE)
set(CMAKE_C_FLAGS_RELEASESSE2 set(CMAKE_C_FLAGS_RELEASESSE2
"${CMAKE_C_FLAGS_RELEASESSE2} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2" "${CMAKE_C_FLAGS_RELEASESSE2} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2 /fp:fast"
CACHE STRING "C compiler release-SSE2 options" FORCE) CACHE STRING "C compiler release-SSE2 options" FORCE)
set(CMAKE_CXX_STANDARD_LIBRARIES "") set(CMAKE_CXX_STANDARD_LIBRARIES "")

2
indra/llcommon/llversionviewer.h
View File

@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5; const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0; const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Singularity Viewer"; const char * const LL_CHANNEL = "Singularity Viewer";

1217
indra/newview/app_settings/settings.xml
View File

File diff suppressed because it is too large Load Diff

31
indra/newview/app_settings/settings_ascent.xml
View File

@@ -2,6 +2,29 @@
<llsd> <llsd>
<map> <map>
<!-- Ascent-Specific Settings --> <!-- Ascent-Specific Settings -->
<key>SianaUnsitOnCamReset</key>
<map>
<key>Comment</key>
<string>Make avatar stand up when camera is reset to 3rd Person View</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>PhoenixNameSystem</key>
<map>
<key>Comment</key>
<string>Use Display Names instead of Legacy Names. 0 = Old Style, 1 = Display Names and Username, 2 = Displayname only</string>
<key>Persist</key>
<integer>2</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentPowerfulWizard</key> <key>AscentPowerfulWizard</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
@@ -78,7 +101,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<iAscentCmdLineTP2nteger>0</integer> <integer>0</integer>
</map> </map>
<key>AscentDataSeparator</key> <key>AscentDataSeparator</key>
<map> <map>
@@ -166,7 +189,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <real>0</real>
</map> </map>
<key>AscentUseStatusColors</key> <key>AscentUseStatusColors</key>
<map> <map>
@@ -177,7 +200,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <real>0</real>
</map> </map>
<key>AscentAvatarXModifier</key> <key>AscentAvatarXModifier</key>
<map> <map>
@@ -729,5 +752,7 @@
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
</map> </map>
</llsd> </llsd>

1
indra/newview/app_settings/settings_ascent_coa.xml
View File

@@ -175,5 +175,6 @@
<key>IsCOA</key> <key>IsCOA</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
</map> </map>
</llsd> </llsd>

92
indra/newview/app_settings/settings_rlv.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<llsd> <llsd>
<map> <map>
<key>RestrainedLove</key> <key>RestrainedLove</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
@@ -34,6 +35,50 @@
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>RestrainedLoveOffsetAvatarZ</key>
<map>
<key>Comment</key>
<string>Offset the avatar.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>RestrainedLoveReplaceWhenFolderBeginsWith</key>
<map>
<key>Comment</key>
<string>If a folder name begins with this string, its attach behavior will always be "replace", never "stack". Default is blank (disabled).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>RestrainedLoveStackWhenFolderBeginsWith</key>
<map>
<key>Comment</key>
<string>If a folder name begins with this string, its attach behavior will always be "stack", never "replace". Default is "+".</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>+</string>
</map>
<key>RLVaDebugHideUnsetDuplicate</key>
<map>
<key>Comment</key>
<string>Suppresses reporting "unset" or "duplicate" command restrictions when RestrainedLoveDebug is TRUE</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RestrainedLoveForbidGiveToRLV</key> <key>RestrainedLoveForbidGiveToRLV</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
@@ -67,21 +112,10 @@
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>RLVaEnableWear</key>
<map>
<key>Comment</key>
<string>Enables the "Wear" option on the inventory item context menu for attachments</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RLVaEnableSharedWear</key> <key>RLVaEnableSharedWear</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Attachments in the shared #RLV folder can be force-attached without needing to specify an attachment point (as long as no attachment is non-detachable)</string> <string>Attachments in the shared #RLV folder can be force-attached without needing to specify an attachment point</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
@@ -133,39 +167,6 @@
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>WarnFirstRLVDetach</key>
<map>
<key>Comment</key>
<string>Enables FirstRLVDetach warning dialog</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>WarnFirstRLVEnableWear</key>
<map>
<key>Comment</key>
<string>Enables RLVEnableWear warning dialog</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>WarnFirstRLVFartouch</key>
<map>
<key>Comment</key>
<string>Enables FirstRLVFartouch warning dialog</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>WarnFirstRLVGiveToRLV</key> <key>WarnFirstRLVGiveToRLV</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
@@ -177,5 +178,6 @@
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
</map> </map>
</llsd> </llsd>

4
indra/newview/app_settings/settings_sh.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<llsd> <llsd>
<map> <map>
<key>SHAllowScriptCommands</key> <key>SHAllowScriptCommands</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
@@ -10,7 +11,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>0</integer>
</map> </map>
<key>SHScriptCommandPrefix</key> <key>SHScriptCommandPrefix</key>
<map> <map>
@@ -89,5 +90,6 @@
<key>Value</key> <key>Value</key>
<real>1.0</real> <real>1.0</real>
</map> </map>
</map> </map>
</llsd> </llsd>

BIN
indra/newview/installers/windows/language_menu.nsi
View File

Binary file not shown.