diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-30 12:05:35 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-30 12:05:35 -0700 |
commit | 71993b14d1bd95da9b851ac8b7079a4acdbd42ef (patch) | |
tree | 342060ea33dbea67127a5cd0e2f586c38ed127ff /indra/newview/skins/default/xui/en | |
parent | e5f6f063c199a30297776801704caa8e41b609a3 (diff) | |
parent | 31eac6e0eeae507a13a23a9116c87eb815ab8141 (diff) |
merge with remote repo
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_moveview.xml | 6 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/panel.xml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 01a1b95a9a..02cbef5987 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -3,7 +3,7 @@ legacy_header_height="18" can_dock="true" can_close="true" - can_minimize="true" + can_minimize="false" center_horiz="true" follows="bottom" height="110" @@ -38,7 +38,7 @@ Fly Backwards (press Down Arrow or S) </string> <panel - border="true" + border="false" height="83" follows="left|top" layout="topleft" @@ -136,7 +136,7 @@ </panel> <!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml --> <panel - border="true" + border="false" height="27" layout="topleft" left="0" diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index 127f0f40e8..1bd5a5bda2 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Optional parameters: + border - show border around panel bg_opaque_image - image name for "in-front" panel look bg_alpha_image - image name for "in-back" or transparent panel look --> |