diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-22 17:27:11 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-22 17:27:11 -0400 |
| commit | e15b7bafbb7168a721ffd286c1d1f4e6299abb44 (patch) | |
| tree | 8e3d92d76dc38687ddbd05ad2791ed845c95fdc7 /indra | |
| parent | 87f77337ac01e16bb2cf30984d6a0113e44e2aaf (diff) | |
| parent | 697bb80968e1fc539a023284ad5135e15d38d150 (diff) | |
merge changes for llsd validity errors in settings
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 90d935f14b..f2e1e7f7d4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12723,6 +12723,7 @@ <key>Type</key> <string>LLSD</string> <key>Value</key> + <array/> </map> <key>VFSOldSize</key> <map> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 863b5b0435..e660c1a33b 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -1,2 +1,4 @@ <?xml version="1.0"?> -<llsd/> +<llsd> + <undef/> +</llsd> |