summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-09-13 10:34:54 -0700
committerRichard Nelson <none@none>2010-09-13 10:34:54 -0700
commit19848665587fce7fc232c528add88c994ddefd63 (patch)
tree5c435b6493947507920d6e31baf95cb6e5f0dcb5 /indra/newview/app_settings
parent24f308caaeda941a626b6143d95adbfe07450f97 (diff)
parente2257bc78e53162127c49adad3f9dc406ecc270e (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6ea4cf8625..efe418f0e8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2809,7 +2809,18 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>EnableVoiceChat</key>
+ <key>EnableUIHints</key>
+ <map>
+ <key>Comment</key>
+ <string>Toggles UI hint popups</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>EnableVoiceChat</key>
<map>
<key>Comment</key>
<string>Enable talking to other residents with a microphone</string>