aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-06 23:12:07 -0700
committerMcCabe Maxsted2010-04-06 23:12:07 -0700
commitb020935686861c1679d9593732d882cb7299d6f8 (patch)
tree309c31c1f633a61b8606b8a93325defa5ac06b8c /linden/indra/newview
parentUse '>>' for objects without names rather than 'no name' (diff)
downloadmeta-impy-b020935686861c1679d9593732d882cb7299d6f8.zip
meta-impy-b020935686861c1679d9593732d882cb7299d6f8.tar.gz
meta-impy-b020935686861c1679d9593732d882cb7299d6f8.tar.bz2
meta-impy-b020935686861c1679d9593732d882cb7299d6f8.tar.xz
Fixed temporary image upload checkbox overrunning upload window
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
index 76c1852..975f650 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater can_close="true" can_drag_on_left="false" can_minimize="false" 2<floater can_close="true" can_drag_on_left="false" can_minimize="false"
3 can_resize="false" height="440" min_height="140" min_width="300" 3 can_resize="false" height="450" min_height="450" min_width="300"
4 name="Image Preview" title="" width="300"> 4 name="Image Preview" title="" width="300">
5 <text bottom_delta="-40" follows="top|left" height="15" left="10" name="name_label"> 5 <text bottom_delta="-40" follows="top|left" height="15" left="10" name="name_label">
6 Name: 6 Name:
@@ -53,16 +53,16 @@
53 53
54Try saving image as 24 bit Targa (.tga). 54Try saving image as 24 bit Targa (.tga).
55 </text> 55 </text>
56 <check_box bottom="37" control_name="LosslessJ2CUpload" enabled="false" 56 <check_box bottom="45" control_name="LosslessJ2CUpload" enabled="false"
57 follows="bottom|left" font="SansSerifSmall" height="16" 57 follows="bottom|left" font="SansSerifSmall" height="16"
58 initial_value="false" label="Use lossless compression" left="10" 58 initial_value="false" label="Use lossless compression" left="10"
59 left_delta="2" name="lossless_check" width="280" /> 59 left_delta="2" name="lossless_check" width="280" />
60 <check_box bottom="37" control_name="EmeraldTemporaryUpload" enabled="true" 60 <check_box bottom_delta="-18" control_name="EmeraldTemporaryUpload" enabled="true"
61 follows="bottom|left" font="SansSerifSmall" height="16" 61 follows="bottom|left" font="SansSerifSmall" height="16"
62 initial_value="false" label="Temporary Image (Free)" 62 initial_value="false" label="Temporary Image (Free)"
63 left_delta="155" name="temp_check" width="280" tooltip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." /> 63 left_delta="0" name="temp_check" width="280" tooltip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." />
64 <button bottom="10" follows="bottom|right" height="20" label="Cancel" left="165" 64 <button bottom="5" follows="bottom|right" height="20" label="Cancel" left="165"
65 name="cancel_btn" width="125" /> 65 name="cancel_btn" width="125" />
66 <button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])" 66 <button bottom="5" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
67 left="15" name="ok_btn" width="125" /> 67 left="15" name="ok_btn" width="125" />
68</floater> 68</floater>