diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-28 13:46:25 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-28 13:46:25 -0400 |
commit | effaca51841d6f07403b196a8d972861bb7e0f05 (patch) | |
tree | 9bebc2e9327bcdeb43b0651fdae6c889eb71a8f9 /indra/newview/app_settings | |
parent | f9ef7ba13a3ee008cb958c2852dff6c8f1073ee0 (diff) | |
parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) |
merge changes for 3.5.0-beta6
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index ada374f892..590f41283b 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -292,6 +292,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>NearbyChatIsNotCollapsed</key> + <map> + <key>Comment</key> + <string>Saving expanded/collapsed 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> |