diff options
| author | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
| commit | fe8dec32dbdd6085dd582c49134551638561ca0e (patch) | |
| tree | 8adf11b88185879911fca64825e73b95ff9db972 /indra/newview/app_settings | |
| parent | 2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa (diff) | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
Merge
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 3 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings_per_account.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 138bdde9e9..408d82ff69 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5019,6 +5019,7 @@ <key>Type</key> <string>LLSD</string> <key>Value</key> + <array/> </map> <key>LSLFindCaseInsensitivity</key> <map> @@ -11774,7 +11775,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>0.0</integer> + <real>0.0</real> </map> <key>TextureFetchSource</key> <map> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index d119504017..c62b45ed81 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -97,7 +97,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>true</integer> + <integer>1</integer> </map> <key>InstantMessageLogPath</key> <map> |