diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
| commit | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch) | |
| tree | fb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /indra/newview/app_settings | |
| parent | 21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff) | |
| parent | 1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff) | |
merge changes for 3.5.1-release
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/logcontrol.xml | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/settings.xml | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 92a241857e..92a241857e 100644..100755 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 448fdaadba..5ab9cd4d96 100644..100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2015,7 +2015,7 @@ <key>Value</key> <string /> </map> - <key>DebugAvatarAppearanceMessage</key> + <key>DebugAvatarAppearanceMessage</key> <map> <key>Comment</key> <string>Dump a bunch of XML files when handling appearance messages</string> @@ -2070,7 +2070,7 @@ <key>Value</key> <integer>1</integer> </map> - <key>DebugAvatarCompositeBaked</key> + <key>DebugAvatarCompositeBaked</key> <map> <key>Comment</key> <string>Colorize avatar meshes based on baked/composite state.</string> |