diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-04-14 16:40:47 +0300 | 
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-04-14 16:40:47 +0300 | 
| commit | 2ddcd1dbd3ba838a9fd50f7db3ccf906ecf61ad8 (patch) | |
| tree | e7f1091012fac19ee5dc8da3c187bd22aa49c264 /indra/newview | |
| parent | 5faad370242649e911dfc866d2995e3d3c962bbd (diff) | |
Fixed critical bug EXT-6847 (Default configuration has Away Timeout set to "Never")
Reason: changeset 97654b5b6313 for EXT-4843 [NUX] Set default Preferences. Setting was reset to 0.
Fix: restored default value 300. Also updated setting's description with supported combobox values (0, 120, 300, 600, 1800)
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/234/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f76b471c9c..c9b5631d54 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4,13 +4,14 @@      <key>AFKTimeout</key>      <map>        <key>Comment</key> -      <string>Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never)</string> +      <string>Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never).  +        Valid values are: 0, 120, 300, 600, 1800</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key>        <string>S32</string>        <key>Value</key> -      <real>0</real> +      <real>300</real>      </map>      <key>AdvanceSnapshot</key>      <map> | 
