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

Merge remote-tracking branch 'siana/master' into AltCompilers

Browse Source
This commit is contained in:
Drake Arconis
2012-07-10 14:16:24 -04:00
parent edb144bd1d fe65e19b67
commit 1101b4075a
35 changed files with 983 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,19 @@
<integer>1</integer>
</map>
<key>SianaVoidWaterSubdivision</key>
<map>
<key>Comment</key>
<string>Number of tiles of void water</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>8</integer>
</map>
<key>SGAbsolutePointer</key>
<map>
<key>Comment</key>
@@ -759,7 +772,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>PrivateLookAt</key>
<map>
@@ -8514,7 +8527,7 @@
<integer>29</integer>
</array>
</map>
<key>DisableWindAudio</key>
<key>MuteWind</key>
<map>
<key>Comment</key>
<string>Disable the wind audio effect</string>

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

@@ -125,17 +125,6 @@
<key>Value</key>
<string>::</string>
</map>
<key>AscentHideTypingNotification</key>
<map>
<key>Comment</key>
<string>Keep those jerks guessing by hiding your "____ is typing..." message.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentShowSelfTag</key>
<map>
<key>Comment</key>

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

@@ -44,7 +44,20 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentHideTypingNotification</key>
<map>
<key>Comment</key>
<string>Keep those jerks guessing by hiding your "____ is typing..." message.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
@@ -191,5 +204,164 @@
<integer>1</integer>
</map>
<key>BuildPrefs_Xsize</key>
<map>
<key>Comment</key>
<string>Default Size For New Objects to be created X</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.5</real>
</map>
<key>BuildPrefs_Ysize</key>
<map>
<key>Comment</key>
<string>Default Size For New Objects to be created Y</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.5</real>
</map>
<key>BuildPrefs_Zsize</key>
<map>
<key>Comment</key>
<string>Default Size For New Objects to be created Z</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.5</real>
</map>
<key>EmeraldBuildPrefs_Phantom</key>
<map>
<key>Comment</key>
<string>Default Setting For New Objects to be created, phantom flag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>EmeraldBuildPrefs_Temporary</key>
<map>
<key>Comment</key>
<string>Default Setting For New Objects to be created, temp flag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>EmeraldBuildPrefs_Physical</key>
<map>
<key>Comment</key>
<string>Default Setting For New Objects to be created, physical flag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>EmeraldBuildPrefs_EmbedItem</key>
<map>
<key>Comment</key>
<string>Whether to add item to objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>BuildPrefs_Material</key>
<map>
<key>Comment</key>
<string>Default Setting For New Objects to be created, physical flag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Wood</string>
</map>
<key>EmeraldBuildPrefs_Color</key>
<map>
<key>Comment</key>
<string>Color of new objects textures</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<key>EmeraldBuildPrefs_Texture</key>
<map>
<key>Comment</key>
<string>Texture used as 'Default' for new object created</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>89556747-24cb-43ed-920b-47caed15465f</string>
</map>
<key>EmeraldBuildPrefs_Alpha</key>
<map>
<key>Comment</key>
<string>Default Alpha For New Objects to be created</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>EmeraldBuildPrefs_Glow</key>
<map>
<key>Comment</key>
<string>Default Glow For New Objects to be created</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>EmeraldBuildPrefs_FullBright</key>
<map>
<key>Comment</key>
<string>Default Setting For New Objects to be created, whether textures are full bright</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>EmeraldBuildPrefs_Shiny</key>
<map>
<key>Comment</key>
<string>Shiny level used as 'Default' for new objects created</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>None</string>
</map>
</map>
</llsd>

11
indra/newview/app_settings/settings_per_account.xml
View File

@@ -623,6 +623,17 @@
<key>Value</key>
<string></string>
</map>
<key>EmeraldBuildPrefs_Item</key>
<map>
<key>Comment</key>
<string>UUID of item added to new object created</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
</map>
</llsd>