diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:36:16 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:36:16 -0400 |
| commit | 51ecc8208a1b70c9742656230df00b08e082a9c8 (patch) | |
| tree | edbc91488d3cf69e308b96004ed5b12efec2b579 /indra/newview/app_settings | |
| parent | 76eb05380c619daac543872d9ad3ca40a03062c0 (diff) | |
| parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
automated merge from viewer-development root
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ad54e1b164..b3f6f0c9f8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2798,6 +2798,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>EffectScriptChatParticles</key> + <map> + <key>Comment</key> + <string>1 = normal behavior, 0 = disable display of swirling lights when scripts communicate</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>EnableRippleWater</key> <map> <key>Comment</key> @@ -4680,6 +4691,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>MiniMapAutoCenter</key> + <map> + <key>Comment</key> + <string>Center the focal point of the minimap.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>Marker</key> <map> <key>Comment</key> |