summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-11 10:56:49 -0800
committerJames Cook <james@lindenlab.com>2009-12-11 10:56:49 -0800
commitae9ca1be630e47e2314eabf9b8edb16eadda9828 (patch)
tree6e28ec62bad6390f7ac0aa8df3372daa8cf94844 /indra/newview/skins/default
parenta87b99cd950de20dc55e1ae6ce7186863a554326 (diff)
EXT-3313 Media Settings window has no background if viewer is too short
Code to set default floater position to top-left was causing incorrect floater height computation when floater XML specified a bottom coordinate. Reviewed with Callum.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_media_settings.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/floater.xml2
2 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml
index 8122386fae..681731b0da 100644
--- a/indra/newview/skins/default/xui/en/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- bottom="666"
can_close="true"
can_drag_on_left="false"
can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 19fb520b44..85d0c633af 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -9,8 +9,6 @@
background_visible="true"
background_opaque="false"
header_height="25"
- top="0"
- left="0"
close_image="Icon_Close_Foreground"
restore_image="Icon_Restore_Foreground"
minimize_image="Icon_Minimize_Foreground"