diff options
| author | Andrew Productengine <adyukov@productengine.com> | 2010-12-23 18:15:54 +0200 |
|---|---|---|
| committer | Andrew Productengine <adyukov@productengine.com> | 2010-12-23 18:15:54 +0200 |
| commit | c02d6a319f378d5dcc34c51b20f556f175d2a40a (patch) | |
| tree | 5b6faeb8961c6d77f3d54b6dbc6c525773d9a0fa /indra/newview/app_settings | |
| parent | 32750132db47eb335c56f6c880902cf7195e1825 (diff) | |
STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference instead of per-machine.
- Made changes in code of floater preferences and panel login that were required because of turning the setting per-account.
- Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
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_per_account.xml | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 871053782b..402a0e85c4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12332,16 +12332,5 @@ <key>Value</key> <string>name</string> </map> - <key>ShowFavoritesOnLogin</key> - <map> - <key>Comment</key> - <string>Determines whether favorites of last logged in user will be saved on exit from viewer and shown on login screen</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> </map> </llsd> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 705c73cbf7..8efec1cff0 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -160,6 +160,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>ShowFavoritesOnLogin</key> + <map> + <key>Comment</key> + <string>Determines whether favorites of last logged in user will be saved on exit from viewer and shown on login screen</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <!-- End of back compatibility settings --> </map> </llsd> |