diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-28 10:12:18 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-28 10:12:18 -0400 |
| commit | 130e4e510198147664a2377b62b22d8e42f00f04 (patch) | |
| tree | 14556a65468e06edcbf6f68c4b026fea16fcd070 /indra/newview/app_settings | |
| parent | 515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff) | |
| parent | cf1747712b154b6984cf374cf9c86f68a1210fb3 (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> |