diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:46:56 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:46:56 +0300 |
| commit | 5a0547cdc366678a21c23ac4669d9e1a867ca331 (patch) | |
| tree | 93664b4de3fdd7993f52150e6ac47c9391830a67 /indra/newview/app_settings | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
| parent | 8c04829110028c951d05470d54de5bf3708ff773 (diff) | |
STORM-1126 merge
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 14f1b3c4ba..c1d6827eac 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11300,6 +11300,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> |