diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
| commit | e1c1428569b03bbb20e7597ebec7d707151ce802 (patch) | |
| tree | 69ca6d0fd05300346ddc14664b6d44bd4206a8b4 /indra/newview/app_settings/settings.xml | |
| parent | f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd (diff) | |
| parent | ab4104d2d785199722f93d027e72af40d16f5703 (diff) | |
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 448fdaadba..2e53cf2da0 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> @@ -11183,7 +11183,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>0.0</integer> + <real>0.0</real> </map> <key>TextureFetchUpdateSkipLowPriority</key> <map> |