diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
| commit | 76e7f978c157f9921593ea0e43f642cb9de4703d (patch) | |
| tree | ccc62865f26cb84cabbe9b65de23c4e1342aa142 /indra/newview/app_settings | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
| parent | cf143bd4610dc279f1aa790e0b37fbad5c86f654 (diff) | |
Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?)
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | 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 d2fbb822b1..e9ea657b52 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2,6 +2,28 @@ <llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd"> <map> + <key>ImporterDebug</key> + <map> + <key>Comment</key> + <string>Enable debug output to more precisely identify sources of import errors. Warning: the output can slow down import on many machines.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Integer</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>IMShowTime</key> + <map> + <key>Comment</key> + <string>Enable(disable) timestamp showing in the chat.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>IMShowTime</key> <map> <key>Comment</key> |