diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-15 17:57:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-15 17:57:48 -0700 |
| commit | e8b22d3299e5e02f3349315fcf9e0166632e06c4 (patch) | |
| tree | f0ae929e3bd76de83d41d7b286dfed15947e821d /indra/newview/app_settings | |
| parent | 242c39f24bc38ee306f1a9b4a173fd095fdab49d (diff) | |
| parent | 780fe4e37fe5df4120ef4de09e6fc69f6184e4d3 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 11 |
2 files changed, 22 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e216c7865d..4c305e1d60 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1716,17 +1716,6 @@ <key>Value</key> <integer>131073</integer> </map> - <key>NearbyChatIsNotTornOff</key> - <map> - <key>Comment</key> - <string>saving torn-off state of the nearby chat between sessions</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>CloseChatOnReturn</key> <map> <key>Comment</key> @@ -4282,6 +4271,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>IMShowContentPanel</key> + <map> + <key>Comment</key> + <string>Show Toolbar and Body Panels</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>IgnoreAllNotifications</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 363713f2f4..47137c8de9 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -281,6 +281,17 @@ <key>Value</key> <integer>2</integer> </map> + <key>NearbyChatIsNotTornOff</key> + <map> + <key>Comment</key> + <string>saving torn-off state of the nearby chat between sessions</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ShowFavoritesOnLogin</key> <map> <key>Comment</key> |