summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-18 15:01:01 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-18 15:01:01 +0200
commitc8fec6554487769d7afe6d02cc58bde1d8c6f7b3 (patch)
treef0d052ec6e75fe340eb3d7c1ac4d91bdc5eebd6c /indra/newview/skins/default/xui/en
parented46f84873c615292965191f28760664a67e0f1f (diff)
parent25800b4b3728b2691a486bbbbd95c9f20e63a1c5 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_script.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml5
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index c3e974d978..984c4fcf1d 100644
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -12,7 +12,7 @@
can_minimize="true"
visible="true"
width="520"
- can_resize="true"
+ can_resize="false"
min_width="350"
min_height="369">
</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 82821a1dfe..f20526b491 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -366,10 +366,7 @@
min_val="64"
name="DrawDistance"
top="3"
- width="255">
- <slider.commit_callback
- function="Pref.UpdateMeterText" />
- </slider>
+ width="255" />
<text
type="string"
length="1"