diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-11 05:52:49 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-11 05:52:49 -0700 |
| commit | 61d6669ffd766208abfa6240edc52723d8d141de (patch) | |
| tree | d0994dc489e8c365395da031d978a005f057a7e9 /indra/newview/app_settings/settings_per_account.xml | |
| parent | 48809cb3a9350a0357a0fc710140e2437f3e068e (diff) | |
| parent | 085b2c24f9ded3d0e9a33500a287aaa53e8b7fba (diff) | |
Merge from 2.1 Alpha tag
Diffstat (limited to 'indra/newview/app_settings/settings_per_account.xml')
| -rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index dc76a4e518..d4000e9253 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -1,26 +1,26 @@ <llsd> <map> - <key>BusyResponseChanged</key> + <key>BusyModeResponse</key> <map> <key>Comment</key> - <string>Does user's busy mode message differ from default?</string> + <string>Auto response to instant messages while in busy mode.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>Boolean</string> + <string>String</string> <key>Value</key> - <integer>0</integer> + <string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> </map> - <key>BusyModeResponse</key> + <key>BusyModeResponse2</key> <map> <key>Comment</key> - <string>Auto response to instant messages while in busy mode.</string> + <string>Auto response to instant messages while in busy mode, clean (unencoded) version of BusyModeResponse</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>String</string> <key>Value</key> - <string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> + <string>|TOKEN COPY BusyModeResponse|</string> </map> <key>InstantMessageLogPath</key> <map> |