diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/app_settings | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 48 |
1 files changed, 35 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4c47cb45b2..fd4f293d66 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -670,6 +670,17 @@ <key>Value</key> <string>http://www.secondlife.com</string> </map> + <key>BlockAvatarAppearanceMessages</key> + <map> + <key>Comment</key> + <string>Ignore's appearance messages (for simulating Ruth)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>BrowserProxyAddress</key> <map> <key>Comment</key> @@ -888,7 +899,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>3</integer> + <integer>8</integer> </map> <key>ButtonFlashRate</key> <map> @@ -899,7 +910,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>2.0</real> + <real>1.25</real> </map> <key>ButtonHPad</key> <map> @@ -4944,17 +4955,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>NoQuickTime</key> - <map> - <key>Comment</key> - <string>Disable quicktime playback.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>NoVerifySSLCert</key> <map> <key>Comment</key> @@ -5701,6 +5701,28 @@ <key>Value</key> <integer>0</integer> </map> + <key>RenderAttachedLights</key> + <map> + <key>Comment</key> + <string>Render lighted prims that are attached to avatars</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>RenderAttachedParticles</key> + <map> + <key>Comment</key> + <string>Render particle systems that are attached to avatars</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RenderAvatarCloth</key> <map> <key>Comment</key> |