diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-31 16:02:15 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-31 16:02:15 -0700 |
commit | 17fc2e1f5b43a94985114722c1106bbc3332d33d (patch) | |
tree | 11e7f066c2407d97a8962433e4a34415615fcc6e /indra/newview/app_settings | |
parent | 6896dd2f866e1a03d68d39f1cf32a66e080746ac (diff) | |
parent | 8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (diff) |
Merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/ignorable_dialogs.xml | 12 | ||||
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 13 |
2 files changed, 23 insertions, 2 deletions
diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml index 89fd4e5935..17d3d3c9c5 100644 --- a/indra/newview/app_settings/ignorable_dialogs.xml +++ b/indra/newview/app_settings/ignorable_dialogs.xml @@ -122,7 +122,17 @@ <key>Value</key> <integer>1</integer> </map> - + <key>FirstSpeak</key> + <map> + <key>Comment</key> + <string>Shows hint for Speak button</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>FirstSit</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c11de57c42..4b530d5b55 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8974,7 +8974,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>2.0</real> + <real>3.0</real> </map> <key>MeshThreadCount</key> <map> @@ -12539,6 +12539,17 @@ <key>Value</key> <real>0.40000000596</real> </map> + <key>moapbeacon</key> + <map> + <key>Comment</key> + <string>Beacon / Highlight media on a prim sources</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>particlesbeacon</key> <map> <key>Comment</key> |