diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 11:33:56 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 11:33:56 -0800 |
| commit | 92cef0426df15c0e661fa795e6b00214f381dd05 (patch) | |
| tree | 4aa5f2277e140e98c381bdcd0facba64d4f0deca /indra/newview/app_settings/settings.xml | |
| parent | c6163fafaac9c72683b11894ed309d1f55a745c8 (diff) | |
| parent | 7f61cde331880baa21801aa0c1c1ccf9dc57946f (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4886deaede..ccafbae156 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -285,7 +285,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>AudioStreamingMusic</key> <map> @@ -296,7 +296,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>AudioStreamingVideo</key> <map> @@ -307,7 +307,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>AuditTexture</key> <map> @@ -1154,7 +1154,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>1</integer> + <integer>5</integer> </map> <key>CameraAngle</key> <map> @@ -3629,7 +3629,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC]/[DEBUG_MODE]</string> + <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC][DEBUG_MODE]</string> </map> <key>HomeSidePanelURL</key> <map> @@ -3686,17 +3686,6 @@ <key>Value</key> <string /> </map> - <key>IMInChat</key> - <map> - <key>Comment</key> - <string>Copy IM into chat console</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>IMShowTimestamps</key> <map> <key>Comment</key> |