diff options
Diffstat (limited to 'indra/newview/skins')
5 files changed, 483 insertions, 431 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 8c87bd42dd..14f9e2db95 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -135,28 +135,28 @@ width="210" /> <button follows="left|top" - height="20" + height="23" label="Use Estate Time" layout="topleft" - left="8" + left="10" name="EnvUseEstateTimeButton" top="120" width="137" /> <button follows="left|top" - height="20" + height="23" label="Advanced Sky" layout="topleft" - left_pad="9" + left_pad="3" name="EnvAdvancedSkyButton" top_delta="0" width="137" /> <button follows="left|top" - height="20" + height="23" label="Advanced Water" layout="topleft" - left_pad="9" + left_pad="3" name="EnvAdvancedWaterButton" top_delta="0" width="137" /> diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index 50f0f0454c..c2fab900e3 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -20,6 +20,22 @@ name="dont_notify"> Don't Notify </floater.string> + <floater.string + name="moderate"> + Moderate + </floater.string> + <floater.string + name="adult"> + Adult + </floater.string> + <floater.string + name="general"> + General + </floater.string> + <floater.string + name="unknown"> + Unknown + </floater.string> <layout_stack name="layout" orientation="vertical" @@ -144,15 +160,33 @@ name="event_location" use_ellipses="true" value="SampleParcel, Name Long (145, 228, 26)" - width="310" /> + width="310" /> <icon - follows="top|left" - height="16" - image_name="Parcel_PG_Dark" - layout="topleft" - left="10" - name="rating_icon" - width="18" /> + follows="top|left" + height="16" + image_name="Parcel_PG_Dark" + layout="topleft" + left="10" + name="rating_icon_pg" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_M_Dark" + layout="topleft" + left="10" + name="rating_icon_m" + top_delta="0" + width="18" /> + <icon + follows="top|left" + height="16" + image_name="Parcel_R_Dark" + layout="topleft" + left="10" + name="rating_icon_r" + top_delta="0" + width="18" /> <text follows="left|top" height="16" diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index 32739ac953..3a44ba3763 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -16,49 +16,49 @@ type="string" length="1" follows="left|top|right" - font.style="BOLD" height="16" layout="topleft" left="10" name="KeyFramePresetsText" top="34" - width="110"> + font="SansSerif" + width="85"> Water Presets: </text> <combo_box - height="18" + height="23" layout="topleft" - left_pad="10" + left_delta="95" name="WaterPresetsCombo" - top_delta="-2" + top_delta="-4" width="150" /> <button - height="20" + height="23" label="New" label_selected="New" layout="topleft" - left_pad="20" + left_pad="3" name="WaterNewPreset" - top_delta="1" - width="90" /> + top_delta="0" + width="70" /> <button - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="10" + left_pad="3" name="WaterSavePreset" top_delta="0" - width="90" /> + width="70" /> <button - height="20" + height="23" label="Delete" label_selected="Delete" layout="topleft" - left_pad="10" + left_pad="3" name="WaterDeletePreset" top_delta="0" - width="90" /> + width="70" /> <tab_container border="false" follows="left|top" @@ -74,7 +74,7 @@ border="true" follows="all" height="180" - label="Settings" + label="SETTINGS" layout="topleft" left="0" mouse_opaque="false" @@ -331,7 +331,7 @@ border="true" follows="all" height="180" - label="Image" + label="IMAGE" layout="topleft" left="0" mouse_opaque="false" @@ -348,7 +348,7 @@ layout="topleft" left="10" name="BHText" - top="10" + top="4" width="200"> Big Wave Direction </text> @@ -361,23 +361,10 @@ layout="topleft" left="10" name="WaterWave1DirXText" - top_pad="4" + top_pad="5" width="10"> X </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="WaterWave1DirYText" - top_delta="18" - width="10"> - Y - </text> <slider control_name="WaterWave1DirX" decimal_digits="2" @@ -390,8 +377,22 @@ max_val="4" min_val="-4" name="WaterWave1DirX" - top="55" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="WaterWave1DirYText" + top_pad="-15" + width="10"> + Y + </text> <slider control_name="WaterWave1DirY" decimal_digits="2" @@ -404,7 +405,8 @@ max_val="4" min_val="-4" name="WaterWave1DirY" - top_pad="5" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -413,9 +415,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="BHText2" - top_delta="3" + top_pad="-10" width="355"> Little Wave Direction </text> @@ -427,24 +429,12 @@ height="16" layout="topleft" left="10" + left_delta="0" name="WaterWave2DirXText" - top="90" + top_pad="5" width="10"> X </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="WaterWave2DirYText" - top_delta="20" - width="10"> - Y - </text> <slider control_name="WaterWave2DirX" decimal_digits="2" @@ -457,8 +447,22 @@ max_val="4" min_val="-4" name="WaterWave2DirX" - top="115" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="WaterWave2DirYText" + top_pad="-15" + width="10"> + Y + </text> <slider control_name="WaterWave2DirY" decimal_digits="2" @@ -471,7 +475,8 @@ max_val="4" min_val="-4" name="WaterWave2DirY" - top_pad="10" + left_pad="3" + top_pad="6" width="200" /> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml index 0cb7814c6a..d09a41978d 100644 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="220" + height="256" layout="topleft" name="WindLight floater" help_topic="windlight_floater" @@ -22,68 +22,64 @@ left="10" name="KeyFramePresetsText" top="34" - width="110"> + width="85"> Sky Presets: </text> <combo_box - height="18" + height="23" layout="topleft" - left_delta="110" + left_delta="85" name="WLPresetsCombo" - top_delta="-2" + top_delta="-4" width="150" /> <button - height="20" + height="23" label="New" label_selected="New" layout="topleft" - left_pad="20" + left_pad="3" name="WLNewPreset" - top_delta="1" width="70" /> <button - height="20" + height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="10" + left_pad="3" name="WLSavePreset" - top_delta="0" width="70" /> <button - height="20" + height="23" label="Delete" label_selected="Delete" layout="topleft" - left_pad="10" + left_pad="3" name="WLDeletePreset" - top_delta="0" width="70" /> <button - height="20" + height="23" label="Day Cycle Editor" label_selected="Day Cycle Editor" layout="topleft" - left_pad="50" + right="-10" name="WLDayCycleMenuButton" - top_delta="0" + top_pad="-23" width="120" /> <tab_container follows="left|top" - height="160" + height="196" halign="center" layout="topleft" left="0" name="WindLight Tabs" tab_position="top" - tab_height="20" top="60" width="700"> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Atmosphere" + height="196" + label="ATMOSPHERE" layout="topleft" left="1" mouse_opaque="false" @@ -113,10 +109,22 @@ layout="topleft" left="10" name="BHText2" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLBlueHorizonR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLBlueHorizonR" + width="200" /> <text type="string" length="1" @@ -124,12 +132,25 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left="10" + top_pad="-15" name="BHText3" - top_delta="11" width="10"> G </text> + <slider + control_name="WLBlueHorizonG" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_delta="0" + name="WLBlueHorizonG" + left_pad="3" + top_pad="6" + width="200" /> <text type="string" length="1" @@ -137,12 +158,24 @@ halign="center" height="16" layout="topleft" - left_delta="0" name="BHText4" - top_delta="11" + left="10" + top_pad="-15" width="10"> B </text> + <slider + control_name="WLBlueHorizonB" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + name="WLBlueHorizonB" + left_pad="3" + top_pad="6" + width="200" /> <text type="string" length="1" @@ -150,49 +183,13 @@ halign="center" height="16" layout="topleft" - left_delta="0" name="BHText5" - top_delta="11" + left="10" + top_pad="-15" width="10"> I </text> <slider - control_name="WLBlueHorizonR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLBlueHorizonR" - top="40" - width="200" /> - <slider - control_name="WLBlueHorizonG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonG" - top_pad="1" - width="200" /> - <slider - control_name="WLBlueHorizonB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonB" - top_pad="1" - width="200" /> - <slider control_name="WLBlueHorizonI" decimal_digits="2" follows="left" @@ -200,9 +197,9 @@ increment="0.01" initial_value="1.0" layout="topleft" - left_delta="0" name="WLBlueHorizonI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -211,9 +208,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left="10" + top_pad="-10" name="BDensText" - top_delta="-2" width="355"> Haze Horizon </text> @@ -225,9 +222,10 @@ increment="0.01" initial_value="0.25" layout="topleft" - left="24" + left="23" + top_delta="0" + top_pad="27" name="WLHazeHorizon" - top="107" width="200" /> <text type="string" @@ -251,10 +249,22 @@ layout="topleft" left="245" name="BHText6" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLBlueDensityR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLBlueDensityR" + width="200" /> <text type="string" length="1" @@ -262,50 +272,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left="245" name="BHText7" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText9" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLBlueDensityR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="259" - name="WLBlueDensityR" - top="40" - width="200" /> <slider control_name="WLBlueDensityG" decimal_digits="2" @@ -316,8 +288,22 @@ layout="topleft" left_delta="0" name="WLBlueDensityG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left="245" + name="BHText8" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLBlueDensityB" decimal_digits="2" @@ -328,8 +314,22 @@ layout="topleft" left_delta="0" name="WLBlueDensityB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left="245" + name="BHText9" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLBlueDensityI" decimal_digits="2" @@ -340,7 +340,8 @@ layout="topleft" left_delta="0" name="WLBlueDensityI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -349,9 +350,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left="245" name="HDText" - top_delta="-2" + top_pad="-10" width="355"> Haze Density </text> @@ -363,10 +364,10 @@ increment="0.01" initial_value="0.7" layout="topleft" - left="259" + left="258" max_val="4" name="WLHazeDensity" - top="107" + top_pad="27" width="200" /> <text type="string" @@ -389,10 +390,10 @@ increment="0.01" initial_value="0.1" layout="topleft" - left="494" + left_delta="13" max_val="0.9" name="WLDensityMult" - top="40" + top_pad="27" width="200" /> <text type="string" @@ -401,9 +402,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLDistanceMultText" - top_delta="-3" + top_pad="-10" width="355"> Distance Multiplier </text> @@ -414,11 +415,11 @@ height="10" initial_value="1.0" layout="topleft" - left="494" + left_delta="13" max_val="100" name="WLDistanceMult" - top="73" - width="207" /> + top_pad="27" + width="200" /> <text type="string" length="1" @@ -426,9 +427,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="MaxAltText" - top_delta="-2" + top_pad="-15" width="355"> Max Altitude </text> @@ -440,17 +441,17 @@ increment="1" initial_value="500" layout="topleft" - left="494" + left_delta="13" max_val="4000" name="WLMaxAltitude" - top="107" - width="205" /> + top_pad="27" + width="200" /> </panel> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Lighting" + height="196" + label="LIGHTING" layout="topleft" left_delta="0" help_topic="windlight_lighting_tab" @@ -477,12 +478,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLSunlightR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLSunlightR" + width="200" /> <text type="string" length="1" @@ -490,50 +503,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText2" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText3" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText4" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLSunlightR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLSunlightR" - top="40" - width="200" /> <slider control_name="WLSunlightG" decimal_digits="2" @@ -544,8 +519,22 @@ layout="topleft" left_delta="0" name="WLSunlightG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText3" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLSunlightB" decimal_digits="2" @@ -556,8 +545,22 @@ layout="topleft" left_delta="0" name="WLSunlightB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText4" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLSunlightI" decimal_digits="2" @@ -568,7 +571,8 @@ layout="topleft" left_delta="0" name="WLSunlightI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -577,9 +581,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="TODText" - top_delta="-2" + top_pad="-10" width="355"> Sun/Moon Position </text> @@ -587,9 +591,9 @@ height="20" image_name="icon_diurnal.tga" layout="topleft" - left="30" + left_delta="14" + top_pad="10" name="SkyDayCycle" - top="97" width="148" /> <slider control_name="WLSunAngle" @@ -598,10 +602,10 @@ increment="0.001" initial_value="0.7" layout="topleft" - left="24" + left_delta="-8" name="WLSunAngle" - top="137" - width="204" /> + top_pad="20" + width="207" /> <text type="string" length="1" @@ -622,12 +626,24 @@ halign="center" height="16" layout="topleft" - left="245" + left_delta="0" name="BHText5" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLAmbientR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLAmbientR" + width="200" /> <text type="string" length="1" @@ -635,50 +651,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText6" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText7" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLAmbientR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="259" - name="WLAmbientR" - top="40" - width="200" /> <slider control_name="WLAmbientG" decimal_digits="2" @@ -689,8 +667,22 @@ layout="topleft" left_delta="0" name="WLAmbientG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText7" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLAmbientB" decimal_digits="2" @@ -701,8 +693,22 @@ layout="topleft" left_delta="0" name="WLAmbientB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText8" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLAmbientI" decimal_digits="2" @@ -713,7 +719,8 @@ layout="topleft" left_delta="0" name="WLAmbientI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -722,9 +729,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLEastAngleText" - top_delta="-2" + top_pad="-10" width="355"> East Angle </text> @@ -736,9 +743,9 @@ increment="0.01" initial_value="0.0" layout="topleft" - left="259" + left_delta="13" name="WLEastAngle" - top="107" + top_pad="27" width="200" /> <text type="string" @@ -762,10 +769,10 @@ initial_value="0.1" label="Focus " layout="topleft" - left="494" + left_delta="0" max_val="0.5" name="WLGlowB" - top="40" + top_pad="27" width="200" /> <slider control_name="WLGlowR" @@ -780,7 +787,7 @@ max_val="1.99" min_val="1" name="WLGlowR" - top_pad="1" + top_pad="6" width="200" /> <text type="string" @@ -789,9 +796,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="0" name="SceneGammaText" - top_delta="0" + top_pad="-10" width="200"> Scene Gamma </text> @@ -803,11 +810,11 @@ increment="0.01" initial_value="2.0" layout="topleft" - left="494" + left_delta="0" max_val="10" name="WLGamma" - top="87" - width="207" /> + top_pad="27" + width="200" /> <text type="string" length="1" @@ -815,9 +822,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="0" name="WLStarText" - top_delta="-1" + top_pad="-10" width="355"> Star Brightness </text> @@ -829,17 +836,17 @@ increment="0.01" initial_value="0" layout="topleft" - left="494" + left_delta="0" max_val="2" name="WLStarAlpha" - top="122" + top_pad="27" width="200" /> </panel> <panel border="true" follows="left|top|right|bottom" - height="160" - label="Clouds" + height="196" + label="CLOUDS" layout="topleft" left_delta="0" mouse_opaque="false" @@ -867,12 +874,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText" - top="21" + top_pad="5" width="10"> R </text> + <slider + control_name="WLCloudColorR" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.7" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudColorR" + width="200" /> <text type="string" length="1" @@ -880,50 +899,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText2" - top_delta="11" + top_pad="-15" width="10"> G </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText3" - top_delta="11" - width="10"> - B - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText4" - top_delta="11" - width="10"> - I - </text> - <slider - control_name="WLCloudColorR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="24" - name="WLCloudColorR" - top="40" - width="200" /> <slider control_name="WLCloudColorG" decimal_digits="2" @@ -934,8 +915,22 @@ layout="topleft" left_delta="0" name="WLCloudColorG" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText3" + top_pad="-15" + width="10"> + B + </text> <slider control_name="WLCloudColorB" decimal_digits="2" @@ -946,8 +941,22 @@ layout="topleft" left_delta="0" name="WLCloudColorB" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText4" + top_pad="-15" + width="10"> + I + </text> <slider control_name="WLCloudColorI" decimal_digits="2" @@ -958,7 +967,8 @@ layout="topleft" left_delta="0" name="WLCloudColorI" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -967,9 +977,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudColorText2" - top_delta="-2" + top_pad="-10" width="355"> Cloud XY/Density </text> @@ -980,12 +990,24 @@ halign="center" height="16" layout="topleft" - left="10" + left_delta="0" name="BHText5" - top="87" + top_pad="5" width="10"> X </text> + <slider + control_name="WLCloudX" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudX" + width="200" /> <text type="string" length="1" @@ -993,12 +1015,24 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText6" - top_delta="11" + top_pad="-15" width="10"> Y </text> + <slider + control_name="WLCloudY" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudY" + width="200" /> <text type="string" length="1" @@ -1006,37 +1040,13 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText7" - top_delta="11" + top_pad="-15" width="10"> D </text> <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="4" - name="WLCloudX" - top_delta="-2" - width="200" /> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="0" - name="WLCloudY" - top_pad="1" - width="200" /> - <slider control_name="WLCloudDensity" decimal_digits="2" follows="left" @@ -1046,7 +1056,8 @@ layout="topleft" left_delta="0" name="WLCloudDensity" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" @@ -1069,9 +1080,9 @@ increment="0.01" initial_value="0.5" layout="topleft" - left="259" + left_delta="13" name="WLCloudCoverage" - top="40" + top_pad="27" width="200" /> <text type="string" @@ -1080,9 +1091,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudScaleText" - top_delta="-1" + top_pad="-10" width="355"> Cloud Scale </text> @@ -1094,10 +1105,10 @@ increment="0.01" initial_value="1.0" layout="topleft" - left="259" + left_delta="13" min_val="0.01" name="WLCloudScale" - top="75" + top_pad="27" width="200" /> <text type="string" @@ -1106,9 +1117,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="-14" + left_delta="-13" name="WLCloudDetailText" - top_delta="-4" + top_pad="-10" width="355"> Cloud Detail (XY/Density) </text> @@ -1119,12 +1130,24 @@ halign="center" height="16" layout="topleft" - left="245" + left_delta="0" name="BHText8" - top="87" + top_pad="5" width="10"> X </text> + <slider + control_name="WLCloudDetailX" + decimal_digits="2" + follows="left" + height="10" + increment="0.01" + initial_value="0.5" + layout="topleft" + left_pad="3" + top_pad="6" + name="WLCloudDetailX" + width="200" /> <text type="string" length="1" @@ -1132,37 +1155,12 @@ halign="center" height="16" layout="topleft" - left_delta="0" + left_delta="-13" name="BHText9" - top_delta="11" + top_pad="-15" width="10"> Y </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText10" - top_delta="11" - width="10"> - D - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="4" - name="WLCloudDetailX" - top_delta="-2" - width="200" /> <slider control_name="WLCloudDetailY" decimal_digits="2" @@ -1173,8 +1171,22 @@ layout="topleft" left_delta="0" name="WLCloudDetailY" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> + <text + type="string" + length="1" + follows="left|top|right" + halign="center" + height="16" + layout="topleft" + left_delta="-13" + name="BHText10" + top_pad="-15" + width="10"> + D + </text> <slider control_name="WLCloudDetailDensity" decimal_digits="2" @@ -1185,7 +1197,8 @@ layout="topleft" left_delta="0" name="WLCloudDetailDensity" - top_pad="1" + left_pad="3" + top_pad="6" width="200" /> <text type="string" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index a628e76bc0..0d4f67f94c 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -53,7 +53,7 @@ top="0" width="380"> </flat_list_view> - </accordion_tab>5 + </accordion_tab> <accordion_tab layout="topleft" name="3_days_ago" |