diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-11-15 17:48:25 +0200 | 
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-11-15 17:48:25 +0200 | 
| commit | a787e1bb7aad25f9488de7d93298b58820c948d5 (patch) | |
| tree | b343a1d8e1692b8f2847b775ea3b6587897ae912 | |
| parent | 28db67c3952f65d9c3ee23ce85851ba8ab29fc50 (diff) | |
| parent | 4f1d146e19e3aef00c456efec5925043544f5a45 (diff) | |
EXP-1515 merge
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 2 | 
2 files changed, 2 insertions, 2 deletions
| diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index bc6c63985f..a7dabeb563 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12277,7 +12277,7 @@        <key>Type</key>        <string>Boolean</string>        <key>Value</key> -      <integer>1</integer> +      <boolean>1</boolean>      </map>      <key>UseFreezeFrame</key>      <map> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index a7078ce2e1..4aeea8823e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -122,7 +122,7 @@        layout="topleft"        left_delta="0"        name="external" -      value="1" +      value="true"        top="0"        tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."        width="480" /> | 
