diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
| commit | a2c4bb80492132f7981a79e61bd8ddec95ad97dd (patch) | |
| tree | 0aedf927a4a228fb4c4d59905a81d814762ed453 /indra/newview/app_settings | |
| parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
| parent | 5a0547cdc366678a21c23ac4669d9e1a867ca331 (diff) | |
STORM-1126 merge 2
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dd85c5cb86..90967f3af8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11333,6 +11333,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>UseEnvironmentFromRegion</key> + <map> + <key>Comment</key> + <string>Choose whether to use the region's environment settings, or override them with the local settings.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>UseExternalBrowser</key> <map> <key>Comment</key> |