diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-05-07 10:54:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-05-07 10:54:32 -0700 |
| commit | 51c779b5e832a0c303b4c84c7263c7fed3bd9b30 (patch) | |
| tree | 9238b072e26cc02f14336ce16d7e54bf93f27d56 /indra/newview/app_settings | |
| parent | e068e81f9f2c87c54a40020370b7c0105514dda2 (diff) | |
| parent | d892256d5ba142bb8ea7ef11f64c67a498e725e9 (diff) | |
Pull from viewer-experience-merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 13 |
2 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f83aa20e10..ac52cff49a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12734,5 +12734,16 @@ <key>Value</key> <integer>0</integer> </map> + <key>AllowBottomTrayButtonReordering</key> + <map> + <key>Comment</key> + <string>Allow user to move and hide bottom tray buttons</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> </map> </llsd> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index bb022b7b11..d3f0ec5dad 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -124,7 +124,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>VoiceDisableMic</key> <map> @@ -457,5 +457,16 @@ <key>Value</key> <integer>1</integer> </map> + <key>AllowBottomTrayButtonReordering</key> + <map> + <key>Comment</key> + <string>Allow user to move and hide bottom tray buttons</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |