Merge remote-tracking branch 'lirusaito/master'

2013-04-25 07:27:13 +02:00
parent dc4d458e87 b0c331266d
commit b1ffc5b349
20 changed files with 384 additions and 180 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15151,6 +15151,17 @@ This should be as low as possible, but too low may break functionality</string>
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>UseTypingBubbles</key>
+    <map>
+      <key>Comment</key>
+      <string>Show typing indicator in avatar nametags</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
    <key>UseDebugMenus</key>
    <map>
      <key>Comment</key>