diff options
Diffstat (limited to 'indra/newview')
8 files changed, 185 insertions, 199 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index 08e47f7ef6..cda2020fca 100644 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml @@ -166,40 +166,37 @@ <check_box follows="left|bottom" height="20" - label="Apply Immediately" + label="Apply Now" layout="topleft" left="12" name="apply_immediate" - top="353" + top_pad="185" width="100" /> <button follows="left|top" height="32" layout="topleft" - left_delta="130" + left_pad="30" name="color_pipette" picture_style="true" - top="341" width="32" /> <button follows="right|bottom" height="20" - label="Cancel" - label_selected="Cancel" + label="Ok" + label_selected="Select" layout="topleft" - left_delta="75" - name="cancel_btn" - top="353" + left_pad="50" + name="select_btn" width="100" /> <button follows="right|bottom" height="20" - label="Select" - label_selected="Select" + label="Cancel" + label_selected="Cancel" layout="topleft" - left_pad="4" - name="select_btn" - top_delta="0" + left_pad="5" + name="cancel_btn" width="100" /> <text type="string" @@ -219,10 +216,10 @@ follows="left|top" height="16" layout="topleft" - left_delta="0" + left="12" name="(Drag below to save.)" top_pad="66" - width="110"> - (Drag below to save.) + width="130"> + (Drag below to save) </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index e421b1bb5d..e3bea2e2d6 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -33,8 +33,8 @@ layout="topleft" left="10" name="Kick all users" - top="8" - width="100"> + top="30" + width="120"> <button.commit_callback function="GridTools.KickAll" /> </button> @@ -44,10 +44,10 @@ label="Flush This Region's Map Visibility Caches" label_selected="Flush This Region's Map Visibility Caches" layout="topleft" - left_delta="0" + left="10" name="Flush This Region's Map Visibility Caches" - top_pad="8" - width="250"> + top_pad="30" + width="350"> <button.commit_callback function="GridTools.FlushMapVisibilityCaches" /> </button> @@ -71,21 +71,21 @@ layout="topleft" left="10" name="Sim Name:" - top="10" - width="50"> + top="12" + width="80"> Sim Name: </text> <line_editor border_style="line" border_thickness="1" follows="left|top|right" - height="16" + height="20" layout="topleft" - left_pad="10" + left_pad="0" max_length="63" name="region name" top_delta="0" - width="208"> + width="250"> <line_editor.commit_callback function="RegionTools.ChangeAnything" /> </line_editor> @@ -96,7 +96,7 @@ left="10" name="check prelude" tool_tip="Set this to make the region a prelude." - top="30" + top_pad="10" width="180"> <check_box.commit_callback function="RegionTools.ChangePrelude" /> @@ -188,11 +188,11 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Bake Terrain" label_selected="Bake Terrain" layout="topleft" - left_delta="-2" + left="12" name="Bake Terrain" tool_tip="Save the current terrain as default." top_pad="32" @@ -203,14 +203,13 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Revert Terrain" label_selected="Revert Terrain" layout="topleft" - left_delta="0" name="Revert Terrain" tool_tip="Replace the current terrain with default." - top_pad="4" + top_pad="10" width="110"> <button.commit_callback function="RegionTools.RevertTerrain" /> @@ -218,14 +217,13 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Swap Terrain" label_selected="Swap Terrain" layout="topleft" - left_delta="0" name="Swap Terrain" tool_tip="Swap current terrain with default." - top_pad="4" + top_pad="10" width="110"> <button.commit_callback function="RegionTools.SwapTerrain" /> @@ -239,7 +237,7 @@ layout="topleft" left="200" name="estate id" - top="30" + top="40" width="190"> Estate ID: </text> @@ -263,7 +261,7 @@ layout="topleft" left="200" name="parent id" - top="50" + top_pad="4" width="190"> Parent ID: </text> @@ -290,7 +288,7 @@ layout="topleft" left="200" name="Grid Pos: " - top="70" + top_pad="4" width="190"> Grid Pos: </text> @@ -332,8 +330,8 @@ layout="topleft" left="200" name="Redirect to Grid: " - top="90" - width="190"> + top_pad="4" + width="88"> Redirect to Grid: </text> <line_editor @@ -342,10 +340,9 @@ follows="top|right" height="16" layout="topleft" - left_delta="88" + left_pad="0" max_length="10" name="redirectx" - top_delta="0" width="50"> <line_editor.commit_callback function="RegionTools.ChangeAnything" /> @@ -364,15 +361,27 @@ <line_editor.commit_callback function="RegionTools.ChangeAnything" /> </line_editor> - <spinner + <text + type="string" + length="1" + follows="left|top" + font="SansSerif" + height="16" + layout="topleft" + left="200" + name="billable factor text" + top_pad="10" + width="110"> + Billable Factor: + </text> + <spinner follows="top|right" height="16" initial_value="1" layout="topleft" - left="308" max_val="4" name="billable factor" - top="110" + left_pad="0" width="80"> <spinner.commit_callback function="RegionTools.ChangeAnything" /> @@ -384,11 +393,11 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-108" - name="billable factor text" - top_delta="0" + left="200" + name="land cost text" + top_pad="10" width="110"> - Billable Factor: + L$ per m²: </text> <spinner follows="top|right" @@ -396,38 +405,25 @@ increment="1" initial_value="1" layout="topleft" - left="308" + left_pad="0" max_val="100" name="land cost" - top="130" width="80"> <spinner.commit_callback function="RegionTools.ChangeAnything" /> </spinner> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-108" - name="land cost text" - top_delta="0" - width="110"> - L$ per m²: - </text> + <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Refresh" label_selected="Refresh" layout="topleft" left="278" name="Refresh" tool_tip="Click here to refresh the above information." - top="150" + top_pad="10" width="110"> <button.commit_callback function="RegionTools.Refresh" /> @@ -435,14 +431,14 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Apply" label_selected="Apply" layout="topleft" - left_delta="0" + left="278" name="Apply" tool_tip="Click here to apply any changes from above." - top_pad="36" + top="317" width="110"> <button.commit_callback function="RegionTools.ApplyChanges" /> @@ -450,11 +446,11 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Select Region" label_selected="Select Region" layout="topleft" - left="128" + left="130" name="Select Region" tool_tip="Select the whole region with the land tool." top="238" @@ -465,14 +461,14 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Autosave now" label_selected="Autosave now" layout="topleft" left_delta="0" name="Autosave now" tool_tip="Save gzipped state to autosave directory." - top_pad="4" + top_pad="10" width="110"> <button.commit_callback function="RegionTools.SaveState" /> @@ -502,7 +498,7 @@ left="10" name="Sim Name:" top="10" - width="50"> + width="80"> Sim Name: </text> <text @@ -556,7 +552,7 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Apply" label_selected="Apply" layout="topleft" @@ -567,11 +563,11 @@ width="110"> <button.commit_callback function="ObjectTools.ApplyChanges" /> - </button> + </button> <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Set Target" label_selected="Set Target" layout="topleft" @@ -582,7 +578,7 @@ width="110"> <button.commit_callback function="ObjectTools.Set" /> - </button> + </button> <text type="string" length="1" @@ -598,7 +594,7 @@ <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Delete Target's Scripted Objects On Others Land" label_selected="Delete Target's Scripted Objects On Others Land" layout="topleft" @@ -609,11 +605,11 @@ width="380"> <button.commit_callback function="ObjectTools.DeletePublicOwnedBy" /> - </button> + </button> <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Delete Target's Scripted Objects On *Any* Land" label_selected="Delete Target's Scripted Objects On *Any* Land" layout="topleft" @@ -624,11 +620,11 @@ width="380"> <button.commit_callback function="ObjectTools.DeleteAllScriptedOwnedBy" /> - </button> + </button> <button follows="top|right" font="SansSerifSmall" - height="20" + height="22" label="Delete *ALL* Of Target's Objects" label_selected="Delete *ALL* Of Target's Objects" layout="topleft" @@ -639,7 +635,7 @@ width="380"> <button.commit_callback function="ObjectTools.DeleteAllOwnedBy" /> - </button> + </button> <button follows="top|right" font="SansSerifSmall" @@ -647,14 +643,14 @@ label="Get Top Colliders" label_selected="Get Top Colliders" layout="topleft" - left_delta="0" + left="12" name="Get Top Colliders" tool_tip="Gets list of objects experiencing the most narrowphase callbacks." - top_pad="28" - width="110"> + top_pad="20" + width="130"> <button.commit_callback function="ObjectTools.GetTopColliders" /> - </button> + </button> <button follows="top|right" font="SansSerifSmall" @@ -665,11 +661,11 @@ left_delta="0" name="Get Top Scripts" tool_tip="Gets list of objects spending the most time running scripts." - top_pad="4" - width="110"> + top_pad="5" + width="130"> <button.commit_callback function="ObjectTools.GetTopScripts" /> - </button> + </button> <button follows="top|right" font="SansSerifSmall" @@ -680,11 +676,11 @@ left_delta="0" name="Scripts digest" tool_tip="Gets a list of all scripts and number of occurences of each." - top_pad="4" - width="110" > + top_pad="5" + width="130" > <button.commit_callback function="ObjectTools.GetScriptDigest" /> - </button> + </button> </panel> <panel border="true" @@ -700,16 +696,16 @@ type="string" length="1" follows="left|top" - height="10" + height="22" layout="topleft" left="10" name="Destination:" - top="4" + top="12" width="80"> Destination: </text> <combo_box - height="16" + height="22" layout="topleft" left_pad="10" name="destination" @@ -728,17 +724,17 @@ type="string" length="1" follows="left|top" - height="10" + height="22" layout="topleft" left="10" name="Request:" - top="28" + top_pad="10" width="80"> Request: </text> <combo_box allow_text_entry="true" - height="16" + height="22" layout="topleft" left_pad="10" name="request" @@ -769,7 +765,7 @@ layout="topleft" left="10" name="Parameter:" - top="52" + top_pad="10" width="80"> Parameter: </text> @@ -777,7 +773,7 @@ border_style="line" border_thickness="1" follows="left|top" - height="16" + height="22" layout="topleft" left_pad="10" max_length="63" @@ -792,8 +788,8 @@ layout="topleft" left="10" name="Make Request" - top="96" - width="100"> + top_pad="10" + width="140"> <button.commit_callback function="GodTools.Request" /> </button> diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index 19fba52500..b7733c6388 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -13,7 +13,7 @@ layout="topleft" left="10" name="Filtering:" - top="30" + top="20" width="128"> Filtering: </text> @@ -34,20 +34,20 @@ layout="topleft" left="10" name="Antialiasing:" - top="49" + top_pad="7" width="128"> Antialiasing: </text> <combo_box control_name="RenderFSAASamples" - height="16" + height="22" initial_value="false" label="Antialiasing" layout="topleft" left_pad="10" name="fsaa" top_delta="0" - width="64"> + width="130"> <combo_box.item label="Disabled" name="FSAADisabled" @@ -82,7 +82,7 @@ left="10" max_val="2" name="gamma" - top="70" + top_pad="7" width="202" /> <text type="string" @@ -94,17 +94,17 @@ name="(brightness, lower is brighter)" top_delta="2" width="315"> - (brightness, lower is brighter, 0=use default) + (brightness, lower = brighter, 0 = default) </text> <text type="string" length="1" follows="left|top" - height="12" + height="16" layout="topleft" left="10" name="Enable VBO:" - top="92" + top_pad="10" width="128"> Enable VBO: </text> @@ -117,13 +117,12 @@ left_pad="10" name="vbo" tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled." - top_delta="1" width="315" /> <slider control_name="TextureMemory" decimal_digits="0" follows="left|top" - height="16" + height="20" increment="16" initial_value="32" label="Texture Memory (MB):" @@ -133,13 +132,13 @@ max_val="4096" name="GrapicsCardTextureMemory" tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." - top="114" + top_pad="10" width="300" /> <spinner control_name="RenderFogRatio" decimal_digits="1" follows="left|top" - height="16" + height="22" initial_value="4" label="Fog Distance Ratio:" label_width="138" @@ -148,16 +147,16 @@ max_val="10" min_val="0.5" name="fog" - top_pad="8" + top_pad="7" width="202" /> <button follows="right|bottom" - height="20" + height="22" label="OK" label_selected="OK" layout="topleft" - left="-110" + left="-102" name="OK" - top="194" + top="192" width="90" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 4595c9eeda..a767b40b03 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -17,7 +17,7 @@ </floater.string> <floater.string name="not_allowed"> - You are not allowed to view this note. + You do not have permission to view this note. </floater.string> <floater.string name="Title"> @@ -32,10 +32,10 @@ height="16" image_name="icon_lock.tga" layout="topleft" - left="344" + left="340" mouse_opaque="true" name="lock" - top="3" + top="1" width="16" /> <text type="string" @@ -44,10 +44,10 @@ font="SansSerif" height="19" layout="topleft" - left="13" + left="10" name="desc txt" - top="19" - width="80"> + top="22" + width="90"> Description: </text> <line_editor @@ -55,13 +55,12 @@ border_thickness="1" follows="left|top|right" font="SansSerif" - height="19" + height="22" layout="topleft" - left_delta="80" + left_pad="0" max_length="127" name="desc" - top_delta="0" - width="294" /> + width="296" /> <text_editor type="string" length="1" @@ -74,7 +73,7 @@ left="4" max_length="65536" name="Notecard Editor" - handle_edit_keys_directly="true" + handle_edit_keys_directly="true" tab_group="1" top="46" width="392" @@ -83,11 +82,11 @@ </text_editor> <button follows="left|bottom" - height="20" + height="22" label="Save" label_selected="Discard" layout="topleft" - left="9" + left="288" name="Save" top="332" width="100" /> diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index 19f21090ca..e341dd7b97 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -9,18 +9,6 @@ name="Title"> Sound: [NAME] </floater.string> - <line_editor - border_style="line" - border_thickness="1" - follows="left|top|right" - font="SansSerif" - height="19" - layout="topleft" - left="85" - max_length="127" - name="desc" - top="19" - width="127" /> <text type="string" length="1" @@ -29,34 +17,45 @@ height="19" layout="topleft" left="10" + top="22" name="desc txt" - top_delta="0" - width="80"> + width="90"> Description: </text> - <button - follows="left|top" + <line_editor + border_style="line" + border_thickness="1" + follows="left|top|right" + font="SansSerif" height="19" - font="SansSerifSmall" - label="Play Locally" - label_selected="Play Locally" layout="topleft" - left="145" - name="Sound audition btn" - sound_flags="0" - tool_tip="Play this sound so that only you can hear it." - top="51" - width="120" /> + left_pad="0" + max_length="127" + name="desc" + width="170" /> <button follows="left|top" - height="19" + height="22" label="Play in World" label_selected="Play in World" layout="topleft" - left_delta="-126" name="Sound play btn" sound_flags="0" + top="55" + left="10" tool_tip="Play this sound so that others can hear it." - top_delta="0" - width="120" /> + width="125" /> + <button + follows="left|top" + height="22" + font="SansSerifSmall" + label="Play Locally" + label_selected="Play Locally" + layout="topleft" + name="Sound audition btn" + sound_flags="0" + tool_tip="Play this sound so that only you can hear it." + left_pad="10" + width="125" /> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index 661dc63b3d..7bac6fdb32 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -24,10 +24,10 @@ font="SansSerif" height="19" layout="topleft" - left="13" + left="10" name="desc txt" top="21" - width="80"> + width="90"> Description: </text> <line_editor @@ -37,26 +37,23 @@ font="SansSerif" height="19" layout="topleft" - left_delta="80" + left_pad="0" max_length="127" name="desc" - top_delta="-2" - width="194" /> + width="190" /> <button follows="left|bottom" - height="20" - label="Discard" - label_selected="Discard" + height="22" + label="Delete" layout="topleft" - left="9" + left="80" name="Discard" top="302" width="100" /> <button follows="left|bottom" - height="20" - label="Keep" - label_selected="Keep" + height="22" + label="Save" layout="topleft" left_pad="5" name="Keep" @@ -66,12 +63,12 @@ type="string" length="1" follows="left|bottom" - height="14" + height="16" layout="topleft" left="13" name="dimensions" top="287" - width="163"> - Dimensions: [WIDTH] x [HEIGHT] + width="303"> + [WIDTH]px x [HEIGHT]px </text> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index 3c046fa5d7..4d4dc084bf 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -9,13 +9,13 @@ <combo_box allow_text_entry="true" follows="top|left" - height="20" + height="22" layout="topleft" left="15" max_chars="255" name="settings_combo" top="30" - width="200"> + width="320"> <combo_box.commit_callback function="SettingSelect" /> </combo_box> @@ -26,7 +26,7 @@ layout="topleft" left_delta="0" name="comment_text" - top_pad="15" + top_pad="10" width="320" word_wrap="true" /> <combo_box @@ -64,7 +64,7 @@ bottom="185" can_apply_immediately="true" height="55" - name="val_color_swatch" + name="val_color_swatch" label="Color" layout="topleft" width="37" > @@ -124,12 +124,12 @@ function="CommitSettings" /> </spinner> <button - height="20" + height="22" label="Reset to default" layout="topleft" left="15" name="default_btn" - top="190" + top="186" width="150" > <button.commit_callback function="ClickDefault" /> diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml index 8aff16b465..78540c0b98 100644 --- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml @@ -27,7 +27,7 @@ left_delta="0" max_length="63" name="name_form" - top_pad="4" + top_pad="0" width="280" /> <text type="string" @@ -38,7 +38,7 @@ left_delta="0" mouse_opaque="false" name="description_label" - top_pad="4" + top_pad="10" width="270"> Description: </text> @@ -51,25 +51,24 @@ left_delta="0" max_length="127" name="description_form" - top_pad="4" + top_pad="0" width="280" /> <button + follows="left|bottom" + height="22" + label="Upload (L$[AMOUNT])" + layout="topleft" + left="45" + name="ok_btn" + top_pad="60" + width="150" /> + <button follows="right|bottom" - height="20" + height="22" label="Cancel" label_selected="Cancel" layout="topleft" - left="200" name="cancel_btn" - top="160" + left_pad="5" width="90" /> - <button - follows="left|bottom" - height="20" - label="Upload (L$[AMOUNT])" - layout="topleft" - left_delta="-135" - name="ok_btn" - top_delta="0" - width="130" /> </floater> |