diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-22 10:00:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-22 10:00:58 -0400 |
| commit | 31ae74e9f3ac02080ccc8794457cf0b350943ddb (patch) | |
| tree | e45dd5a47d54821193c6dca8073524d2030a79af /indra/newview | |
| parent | bd57150f13c64b208c7f36b22f2141665e0b8c80 (diff) | |
| parent | 61f49cdee48de0d5fa6cda7080bcfce0b449f115 (diff) | |
merge changes for llsd validity errors
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e216c7865d..8e08165615 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11084,7 +11084,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>0.0</integer> + <real>0.0</real> </map> <key>TextureFetchUpdateSkipLowPriority</key> <map> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 01a70f2671..863b5b0435 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -1 +1,2 @@ -<llsd/>
\ No newline at end of file +<?xml version="1.0"?> +<llsd/> |