livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with viewer-development

meow-7.2.2
eli_linden 2011-07-06 11:12:26 -07:00
parent 894e8f2a79
commit ffb3ffb74d
13 changed files with 2871 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
indra/newview/skins/default/xui/en/floater_delete_env_preset.xml Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<floater
legacy_header_height="18"
height="130"
help_topic=""
layout="topleft"
name="Delete Env Preset"
save_rect="true"
title="DELETE ENV PRESET"
width="550">
<string name="title_water">Delete Water Preset</string>
<string name="title_sky">Delete Sky Preset</string>
<string name="title_day_cycle">Delete Day Cycle</string>
<string name="label_water">Preset:</string>
<string name="label_sky">Preset:</string>
<string name="label_day_cycle">Day cycle:</string>
<string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string>
<string name="msg_sky_is_referenced">Cannot remove a preset that is referenced by some day cycle(s).</string>
<string name="combo_label">-Select a preset-</string>
<text
follows="top|left|right"
font="SansSerif"
height="10"
layout="topleft"
left="50"
name="label"
top="60"
width="60">
Preset:
</text>
<combo_box
follows="top|left"
layout="topleft"
left_pad="10"
name="preset_combo"
top_delta="-5"
width="200"/>
<button
follows="bottom|right"
height="23"
label="Delete"
layout="topleft"
left_pad="15"
name="delete"
width="70"/>
<button
follows="bottom|right"
height="23"
label="Cancel"
layout="topleft"
left_pad="5"
name="cancel"
width="70"/>
</floater>

485
indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml Normal file
View File

@ -0,0 +1,485 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="381"
layout="topleft"
name="Edit Day cycle"
help_topic="day_presets"
save_rect="true"
title="Edit Day Cycle"
width="705">
<string name="title_new">Create a New Day Cycle</string>
<string name="title_edit">Edit Day Cycle</string>
<string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string>
<string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string>
<string name="combo_label">-Select a preset-</string>
<text
follows="top|left|right"
height="10"
layout="topleft"
left="10"
name="hint"
top="25"
width="685" />
<text
follows="top|left|right"
font="SansSerif"
height="10"
layout="topleft"
left="10"
name="label"
top_pad="25"
width="120">
Preset Name:
</text>
<combo_box
allow_text_entry="true"
follows="top|left"
layout="topleft"
left_pad="10"
max_chars="100"
name="day_cycle_combo"
top_delta="-5"
width="200" />
<line_editor
height="20"
left_delta="0"
name="day_cycle_name"
top_delta="0"
visible="true"
width="200" />
<text
follows="top|left|right"
height="95"
layout="topleft"
left_pad="10"
name="note"
top_delta="0"
width="345"
wrap="true">
Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
</text>
<!--======== Controls panel ========-->
<text
follows="left|top|right"
height="10"
layout="topleft"
left="10"
name="water_color_label"
top="100"
width="300">
- Click on a tab to edit the specific sky settings and time.
</text>
<text
follows="left|top|right"
height="10"
layout="topleft"
name="water_color_label"
top_pad="10"
width="300">
- Click and drag the tabs to set the transition times.
</text>
<text
follows="left|top|right"
height="10"
layout="topleft"
name="water_color_label"
top_pad="10"
width="300">
- Use the scrubber to preview your day cycle.
</text>
<panel
follows="top|left"
height="100"
name="day_cycle_slider_panel"
layout="topleft"
left_delta="25"
top_pad="15"
width="660">
<multi_slider
can_edit_text="true"
control_name="WLTimeSlider"
decimal_digits="0"
draw_track="false"
follows="bottom"
height="10"
increment="0.0833333"
initial_value="0"
layout="topleft"
left="20"
max_sliders="20"
max_val="24"
name="WLTimeSlider"
show_text="false"
top_pad="0"
use_triangle="true"
width="525" />
<multi_slider
can_edit_text="true"
control_name="WLDayCycleKeys"
decimal_digits="0"
follows="bottom"
height="10"
increment="0.0833333"
initial_value="0"
layout="topleft"
left_delta="0"
max_sliders="20"
max_val="24"
name="WLDayCycleKeys"
show_text="false"
top_pad="15"
width="525" />
<button
height="20"
label="Add Key"
label_selected="Add Key"
layout="topleft"
left_pad="20"
name="WLAddKey"
top_delta="-18"
width="96" />
<button
height="20"
label="Delete Key"
label_selected="Delete Key"
layout="topleft"
name="WLDeleteKey"
top_pad="5"
width="96" />
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left="8"
name="WL12am"
top="74"
width="55">
12am
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL3am"
top_delta="0"
width="55">
3am
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL6am"
top_delta="0"
width="55">
6am
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL9amHash"
top_delta="0"
width="55">
9am
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL12pmHash"
top_delta="0"
width="55">
12pm
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL3pm"
top_delta="0"
width="55">
3pm
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL6pm"
top_delta="0"
width="55">
6pm
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL9pm"
top_delta="0"
width="55">
9pm
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="10"
name="WL12am2"
top_delta="0"
width="55">
12am
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left="20"
name="WL12amHash"
top="54"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="11"
layout="topleft"
left_pad="59"
name="WL3amHash"
top_delta="3"
width="6">
I
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="59"
name="WL6amHash"
top_delta="-3"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="11"
layout="topleft"
left_pad="59"
name="WL9amHash2"
top_delta="3"
width="6">
I
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="59"
name="WL12pmHash2"
top_delta="-3"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="11"
layout="topleft"
left_pad="59"
name="WL3pmHash"
top_delta="3"
width="6">
I
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="59"
name="WL6pmHash"
top_delta="-3"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="11"
layout="topleft"
left_pad="59"
name="WL9pmHash"
top_delta="3"
width="6">
I
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="59"
name="WL12amHash2"
top_delta="-3"
width="6">
|
</text>
</panel>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
left_delta="192"
name="WLCurKeyTimeText2"
top_pad="10"
width="80">
Sky Setting:
</text>
<combo_box
height="18"
label="Preset"
layout="topleft"
left_pad="5"
name="WLSkyPresets"
width="205" />
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-40"
name="WLCurKeyTimeText2"
top_pad="15"
width="35">
Time:
</text>
<time
follows="left|top"
height="16"
label_width="0"
layout="topleft"
left_pad="3"
name="time"
top_delta="-1"
value="6:00 AM"
width="75"/>
<view_border
bevel_style="none"
follows="top|left"
height="0"
layout="topleft"
left="10"
name="horiz_separator"
top_pad="20"
width="685"/>
<loading_indicator
height="23"
layout="topleft"
left="25"
name="progress_indicator"
top="350"
visible="false"
width="23" />
<check_box
follows="top|left"
height="10"
label="Make this my new day cycle"
layout="topleft"
left="310"
name="make_default_cb"
top_delta="13"
width="230"/>
<button
follows="bottom|right"
height="23"
label="Save"
layout="topleft"
left_pad="0"
name="save"
top_delta="-13"
width="70"/>
<button
follows="bottom|right"
height="23"
label="Cancel"
layout="topleft"
left_pad="15"
name="cancel"
top_delta="0"
width="70"/>
</floater>

953
indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml Normal file
View File

@ -0,0 +1,953 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="375"
layout="topleft"
name="Edit Sky Preset"
help_topic="sky_preset"
save_rect="true"
title="Edit Sky Preset"
width="840">
<string name="title_new">Create a New Sky Preset</string>
<string name="title_edit">Edit Sky Preset</string>
<string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
<string name="hint_edit">To edit your sky preset, adjust the controls and click "Save".</string>
<string name="combo_label">-Select a preset-</string>
<text
follows="top|left|right"
height="10"
layout="topleft"
left="30"
name="hint"
top="25"
width="700">
To edit your preset, adjust the controls then click "Save"
</text>
<text
follows="top|left|right"
font="SansSerif"
height="10"
layout="topleft"
left="30"
name="label"
top_pad="25"
width="120">
Preset Name:
</text>
<combo_box
allow_text_entry="true"
follows="top|left"
layout="topleft"
left_pad="10"
max_chars="100"
name="sky_preset_combo"
top_delta="-5"
width="200"/>
<line_editor
height="20"
left_delta="0"
name="sky_preset_name"
top_delta="0"
width="200" />
<text
follows="top|left|right"
height="40"
layout="topleft"
left_pad="10"
name="note"
top_delta="0"
width="405"
wrap="true">
Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
</text>
<!--======== Controls panel ========-->
<view_border
bevel_style="none"
follows="top|left"
height="203"
layout="topleft"
left="25"
name="panel_water_preset"
top="122"
visible="true"
width="790"/>
<tab_container
follows="left|top"
height="225"
halign="center"
layout="topleft"
left="22"
name="WindLight Tabs"
tab_position="top"
top="101"
width="794">
<panel
border="true"
bevel_style="none"
follows="left|top|right|bottom"
height="196"
label="ATMOSPHERE"
layout="topleft"
left="1"
help_topic="sky_preset_atmosphere"
mouse_opaque="false"
name="Atmosphere"
top="60"
width="698">
<!--======== Tab Panel I. I conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left="40"
name="BHText"
top="25"
width="200">
Blue Horizon
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="37"
label_height="0"
layout="topleft"
left_delta="0"
name="WLBlueHorizon"
top_pad="6"
width="60" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="0"
top_pad="20"
name="BDensText"
width="200">
Haze Horizon
</text>
<slider
control_name="WLHazeHorizon"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.25"
layout="topleft"
left_delta="0"
top_pad="6"
name="WLHazeHorizon"
width="200" />
<!--======== Tab Panel I. II conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_pad="55"
name="BDensText2"
top="25"
width="200">
Blue Density
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="37"
label_height="0"
layout="topleft"
left_delta="0"
name="WLBlueDensity"
top_pad="6"
width="60" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="0"
name="HDText"
top_pad="20"
width="200">
Haze Density
</text>
<slider
control_name="WLHazeDensity"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.7"
layout="topleft"
left_delta="0"
max_val="4"
name="WLHazeDensity"
top_pad="6"
width="200" />
<!--======== Tab Panel I. III conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_pad="55"
name="DensMultText"
top="25"
width="200">
Density Multiplier
</text>
<slider
control_name="WLDensityMult"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.1"
layout="topleft"
left_delta="15"
max_val="0.9"
name="WLDensityMult"
top_pad="6"
width="200" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-15"
name="WLDistanceMultText"
top_pad="20"
width="200">
Distance Multiplier
</text>
<slider
control_name="WLDistancMult"
decimal_digits="1"
follows="left|top"
height="10"
initial_value="1.0"
layout="topleft"
left_delta="15"
max_val="100"
name="WLDistanceMult"
top_pad="6"
width="200" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-15"
name="MaxAltText"
top_pad="20"
width="200">
Max Altitude
</text>
<slider
control_name="WLMaxAltitude"
decimal_digits="0"
follows="left|top"
height="10"
increment="1"
initial_value="500"
layout="topleft"
left_delta="15"
max_val="4000"
name="WLMaxAltitude"
top_pad="6"
width="200" />
</panel>
<panel
border="true"
bevel_style="none"
follows="left|top|right|bottom"
height="196"
label="LIGHTING"
layout="topleft"
left_delta="0"
help_topic="sky_preset_lighting"
name="Lighting"
top_delta="4"
width="698">
<!--======== Tab Panel II. I conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left="20"
name="SLCText"
top="25"
width="150">
Sun/Moon Color
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="37"
label_height="0"
layout="topleft"
left_delta="10"
name="WLSunlight"
top_pad="6"
width="60" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-10"
name="WLAmbientText"
top_pad="20"
width="150">
Ambient
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="37"
label_height="0"
layout="topleft"
left_delta="10"
name="WLAmbient"
top_pad="6"
width="60" />
<!--======== Tab Panel II. II conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_pad="100"
name="SunGlowText"
top="25"
width="200">
Sun Glow
</text>
<slider
control_name="WLGlowB"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.1"
label="Focus "
layout="topleft"
left_delta="10"
max_val="0.5"
name="WLGlowB"
top_pad="6"
width="200" />
<slider
control_name="WLGlowR"
decimal_digits="2"
follows="top|left"
height="10"
increment="0.01"
initial_value="0.25"
label="Size "
layout="topleft"
left_delta="0"
max_val="1.99"
min_val="1"
name="WLGlowR"
top_pad="6"
width="200" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-10"
name="WLStarText"
top_pad="20"
width="200">
Star Brightness
</text>
<slider
control_name="WLStarAlpha"
decimal_digits="2"
follows="top|left"
height="10"
increment="0.01"
initial_value="0"
layout="topleft"
left_delta="10"
max_val="2"
name="WLStarAlpha"
top_pad="6"
width="200" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-10"
name="SceneGammaText"
top_pad="20"
width="200">
Scene Gamma
</text>
<slider
control_name="WLGamma"
decimal_digits="2"
follows="top|left"
height="10"
increment="0.01"
initial_value="2.0"
layout="topleft"
left_delta="10"
max_val="10"
name="WLGamma"
top_pad="6"
width="200" />
<!--======== Tab Panel II. III conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_pad="60"
name="TODText"
top="25"
width="200">
Sun/Moon Position
</text>
<multi_slider
can_edit_text="true"
control_name="WLSunPos"
decimal_digits="0"
follows="bottom"
height="10"
increment="0.0833333"
initial_value="0"
layout="topleft"
left_delta="0"
max_sliders="1"
max_val="24"
name="WLSunPos"
show_text="false"
top_pad="0"
width="300" />
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_delta="2"
name="WL12amHash"
top_pad="6"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="66"
name="WL6amHash"
top_delta="0"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="67"
name="WL12pmHash2"
top_delta="0"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="67"
name="WL6pmHash"
top_delta="0"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="14"
layout="topleft"
left_pad="67"
name="WL12amHash2"
top_delta="0"
width="6">
|
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_delta="-300"
name="WL12am"
top="74"
width="55">
12am
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="20"
name="WL6am"
top_delta="0"
width="55">
6am
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="15"
name="WL12pmHash"
top_delta="0"
width="55">
12pm
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="18"
name="WL6pm"
top_delta="0"
width="55">
6pm
</text>
<text
type="string"
length="1"
border_visible="true"
follows="left|top|right"
height="16"
layout="topleft"
left_pad="15"
name="WL12am2"
top_delta="0"
width="55">
12am
</text>
<time
follows="left|top"
height="16"
label_width="0"
layout="topleft"
left_delta="-175"
name="WLDayTime"
top_pad="15"
value="6:00 AM"
width="75"/>
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-106"
name="WLEastAngleText"
top_pad="24"
width="200">
East Angle
</text>
<slider
control_name="WLEastAngle"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.0"
layout="topleft"
left_delta="10"
name="WLEastAngle"
top_pad="6"
width="200" />
</panel>
<panel
border="true"
bevel_style="none"
follows="left|top|right|bottom"
height="196"
label="CLOUDS"
layout="topleft"
left_delta="0"
mouse_opaque="false"
help_topic="sky_preset_clouds"
name="Clouds"
top_delta="4"
width="698">
<!--======== Tab Panel III. I conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left="40"
name="WLCloudColorText"
top="25"
width="200">
Cloud Color
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="37"
label_height="0"
layout="topleft"
left_delta="0"
name="WLCloudColor"
top_pad="6"
width="60" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="0"
name="WLCloudColorText2"
top_pad="20"
width="200">
Cloud XY/Density
</text>
<slider
control_name="WLCloudX"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.5"
label="X"
layout="topleft"
left_delta="0"
top_pad="6"
name="WLCloudX"
width="200" />
<slider
control_name="WLCloudY"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.5"
label="Y"
layout="topleft"
left_delta="0"
top_pad="6"
name="WLCloudY"
width="200" />
<slider
control_name="WLCloudDensity"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="1.0"
label="D"
layout="topleft"
left_delta="0"
name="WLCloudDensity"
top_pad="6"
width="200" />
<!--======== Tab Panel III. II conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_pad="55"
name="WLCloudCoverageText"
top="15"
width="200">
Cloud Coverage
</text>
<slider
control_name="WLCloudCoverage"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.5"
layout="topleft"
left_delta="15"
name="WLCloudCoverage"
top_pad="6"
width="200" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-15"
name="WLCloudScaleText"
top_pad="20"
width="200">
Cloud Scale
</text>
<slider
control_name="WLCloudScale"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="1.0"
layout="topleft"
left_delta="15"
min_val="0.01"
name="WLCloudScale"
top_pad="6"
width="200" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-13"
name="WLCloudDetailText"
top_pad="20"
width="200">
Cloud Detail (XY/Density)
</text>
<slider
control_name="WLCloudDetailX"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.5"
label="X"
layout="topleft"
left_delta="0"
top_pad="6"
name="WLCloudDetailX"
width="200" />
<slider
control_name="WLCloudDetailY"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.5"
label="Y"
layout="topleft"
left_delta="0"
name="WLCloudDetailY"
top_pad="6"
width="200" />
<slider
control_name="WLCloudDetailDensity"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="1.0"
label="D"
layout="topleft"
left_delta="0"
name="WLCloudDetailDensity"
top_pad="6"
width="200" />
<!--======== Tab Panel III. III conlumn of controls ========-->
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_pad="55"
name="WLCloudScrollXText"
top="15"
width="150">
Cloud Scroll X
</text>
<check_box
control_name="WLCloudLockX"
follows="left|top"
height="16"
label="Lock"
layout="topleft"
left_delta="150"
name="WLCloudLockX"
top_delta="0"
width="200" />
<slider
control_name="WLCloudScrollX"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.5"
layout="topleft"
left_delta="-135"
max_val="10"
min_val="-10"
name="WLCloudScrollX"
top_pad="6"
width="200" />
<text
type="string"
length="1"
follows="left|top"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-15"
name="WLCloudScrollYText"
top_pad="20"
width="150">
Cloud Scroll Y
</text>
<check_box
control_name="WLCloudLockY"
follows="left|top"
height="16"
label="Lock"
layout="topleft"
left_delta="150"
name="WLCloudLockY"
width="200" />
<slider
control_name="WLCloudScrollY"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.5"
layout="topleft"
left_delta="-135"
max_val="10"
min_val="-10"
name="WLCloudScrollY"
top_pad="6"
width="200" />
</panel>
</tab_container>
<!--======== End of Controls panel ========-->
<check_box
follows="top|left"
height="10"
label="Make this preset my new sky setting"
layout="topleft"
left="380"
name="make_default_cb"
top_pad="30"
width="280"/>
<button
follows="bottom|right"
height="23"
label="Save"
layout="topleft"
left_pad="0"
name="save"
width="70"/>
<button
follows="bottom|right"
height="23"
label="Cancel"
layout="topleft"
left_pad="15"
name="cancel"
width="70"/>
</floater>

448
indra/newview/skins/default/xui/en/floater_edit_water_preset.xml Normal file
View File

@ -0,0 +1,448 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="375"
layout="topleft"
name="Edit Water Preset"
help_topic="water_preset"
save_rect="true"
title="Edit Water Preset"
width="725">
<string name="title_new">Create a New Water Preset</string>
<string name="title_edit">Edit a Water Preset</string>
<string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
<string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string>
<string name="combo_label">-Select a preset-</string>
<text
follows="top|left|right"
height="10"
layout="topleft"
left="30"
name="hint"
top="25"
width="680">
To edit your preset, adjust the controls then click "Save"
</text>
<text
follows="top|left|right"
font="SansSerif"
height="10"
layout="topleft"
left="30"
name="label"
top_pad="25"
width="120">
Preset Name:
</text>
<combo_box
allow_text_entry="true"
follows="top|left"
layout="topleft"
left_pad="10"
max_chars="100"
name="water_preset_combo"
top_delta="-5"
width="200"/>
<line_editor
height="20"
left_delta="0"
name="water_preset_name"
top_delta="0"
width="200" />
<text
follows="top|left|right"
height="40"
layout="topleft"
left_pad="10"
name="note"
top_delta="0"
width="340"
wrap="true">
Note: if you change the name of your preset, you will be creating a new preset and the existing preset will not be changed.
</text>
<!--======== Controls panel ========-->
<panel
border="false"
bevel_style="none"
follows="top|left"
height="230"
layout="topleft"
left="10"
name="panel_water_preset"
top="100"
width="700">
<!--======== I conlumn of controls ========-->
<text
follows="left|top|right"
height="10"
font="SansSerif"
layout="topleft"
left="10"
name="water_color_label"
top="5"
width="215">
Water Fog Color
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="37"
label_height="0"
layout="topleft"
left_delta="15"
name="WaterFogColor"
top_pad="8"
width="60" />
<text
follows="left|top|right"
font="SansSerif"
layout="topleft"
left_delta="-15"
top_pad="10"
name="water_fog_density_label"
width="215">
Fog Density Exponent
</text>
<slider
decimal_digits="1"
follows="left|top"
height="10"
initial_value="0"
layout="topleft"
left_delta="15"
max_val="10"
name="WaterFogDensity"
top_pad="10"
width="200"/>
<text
follows="left|top|right"
font="SansSerif"
layout="topleft"
left_delta="-15"
top_pad="15"
name="underwater_fog_modifier_label"
width="215">
Underwater Fog Modifier
</text>
<slider
decimal_digits="1"
follows="left|top"
height="10"
initial_value="0"
layout="topleft"
left_delta="15"
max_val="10"
name="WaterUnderWaterFogMod"
top_pad="10"
width="200"/>
<text
follows="left|top|right"
font="SansSerif"
layout="topleft"
left_delta="-15"
name="BHText"
top_pad="15"
width="215">
Big Wave Direction
</text>
<slider
control_name="WaterWave1DirX"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.7"
label="X"
layout="topleft"
max_val="4"
min_val="-4"
name="WaterWave1DirX"
top_pad="10"
width="216"/>
<slider
control_name="WaterWave1DirY"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.7"
label="Y"
layout="topleft"
max_val="4"
min_val="-4"
name="WaterWave1DirY"
top_pad="5"
width="216"/>
<!--======== II conlumn of controls ========-->
<text
follows="left|top|right"
font="SansSerif"
height="10"
layout="topleft"
left_pad="20"
name="BDensText"
top="5"
width="215">
Reflection Wavelet Scale
</text>
<slider
control_name="WaterNormalScaleX"
decimal_digits="1"
follows="left|top"
initial_value="0.7"
layout="topleft"
left_delta="15"
max_val="10"
name="WaterNormalScaleX"
top_pad="10"
width="200"/>
<slider
control_name="WaterNormalScaleY"
decimal_digits="1"
follows="left|top"
initial_value="0.7"
layout="topleft"
max_val="10"
name="WaterNormalScaleY"
top_pad="6"
width="200"/>
<slider
control_name="WaterNormalScaleZ"
decimal_digits="1"
follows="left|top"
initial_value="0.7"
layout="topleft"
max_val="10"
name="WaterNormalScaleZ"
top_pad="6"
width="200"/>
<text
follows="left|top|right"
font="SansSerif"
layout="topleft"
left_delta="-15"
name="HDText"
top_pad="16"
width="215">
Fresnel Scale
</text>
<slider
control_name="WaterFresnelScale"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0.7"
layout="topleft"
left_delta="15"
name="WaterFresnelScale"
top_pad="10"
width="200"/>
<text
follows="left|top|right"
font="SansSerif"
layout="topleft"
left_delta="-15"
name="FresnelOffsetText"
top_pad="15"
width="215">
Fresnel Offset
</text>
<slider
control_name="WaterFresnelOffset"
decimal_digits="2"
follows="left"
increment="0.01"
initial_value="0.7"
layout="topleft"
left_delta="15"
name="WaterFresnelOffset"
top_pad="10"
width="200"/>
<text
follows="left|top|right"
font="SansSerif"
layout="topleft"
left_delta="-15"
name="BHText2"
top_pad="15"
width="215">
Little Wave Direction
</text>
<slider
control_name="WaterWave2DirX"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.7"
label="X"
layout="topleft"
max_val="4"
min_val="-4"
name="WaterWave2DirX"
top_pad="10"
width="216" />
<slider
control_name="WaterWave2DirY"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.7"
label="Y"
layout="topleft"
max_val="4"
min_val="-4"
name="WaterWave2DirY"
top_pad="6"
width="216" />
<!--======== III conlumn of contorls ========-->
<text
follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
left_pad="20"
name="DensMultText"
top="5"
width="215">
Refract Scale Above
</text>
<slider
control_name="WaterScaleAbove"
decimal_digits="2"
follows="left|top"
increment="0.01"
initial_value="0.1"
layout="topleft"
left_delta="15"
name="WaterScaleAbove"
top_pad="5"
width="200" />
<text
type="string"
length="1"
follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-15"
name="WaterScaleBelowText"
top_pad="15"
width="215">
Refract Scale Below
</text>
<slider
control_name="WaterScaleBelow"
decimal_digits="2"
follows="left|top"
height="10"
increment="0.01"
initial_value="0"
layout="topleft"
left_delta="15"
name="WaterScaleBelow"
top_pad="5"
width="200"/>
<text
follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-15"
name="MaxAltText"
top_pad="15"
width="215">
Blur Multiplier
</text>
<slider
control_name="WaterBlurMult"
follows="left|top"
height="10"
increment="0.001"
initial_value="0"
layout="topleft"
left_delta="15"
max_val="0.16"
name="WaterBlurMult"
top_pad="5"
width="200"/>
<text
follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
left_delta="-15"
name="BHText3"
top_pad="15"
width="215">
Normal Map
</text>
<texture_picker
height="80"
layout="topleft"
left_delta="15"
name="WaterNormalMap"
top_pad="5"
width="100" />
</panel>
<!--======== End of Controls panel ========-->
<view_border
bevel_style="none"
follows="top|left"
height="0"
layout="topleft"
left="10"
name="horiz_separator"
top_pad="5"
width="700"/>
<check_box
follows="top|left"
height="10"
label="Make this preset my new water setting"
layout="topleft"
left="275"
name="make_default_cb"
top_pad="20"
width="280"/>
<button
follows="bottom|right"
height="23"
label="Save"
layout="topleft"
left_pad="0"
name="save"
width="70"/>
<button
follows="bottom|right"
height="23"
label="Cancel"
layout="topleft"
left_pad="15"
name="cancel"
width="70"/>
</floater>

162
indra/newview/skins/default/xui/en/floater_environment_settings.xml Normal file
View File

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
height="328"
layout="topleft"
name="Environment Editor Floater"
help_topic="environment_editor_floater"
save_rect="true"
title="ENVIRONMENT SETTINGS"
width="540">
<text
follows="top|left|right"
height="15"
layout="topleft"
left="20"
name="note"
top="25"
width="510"
wrap="true">
Use the options below to customize the environment settings for your viewer.
</text>
<view_border
bevel_style="none"
follows="top|left"
height="237"
layout="topleft"
left="20"
name="border"
top_pad="8"
width="500"/>
<radio_group
follows="top|left"
height="45"
layout="topleft"
left_delta="10"
name="region_settings_radio_group"
top_delta="20"
width="200">
<radio_item
label="Use region settings"
layout="topleft"
name="use_region_settings"/>
<radio_item
label="Customize my environment"
layout="topleft"
name="use_my_settings"
top_pad="20"/>
</radio_group>
<panel
height="170"
layout="topleft"
left="50"
name="user_environment_settings"
top_pad="0"
width="470">
<text
follows="top|left|right"
font="SansSerifItalic"
height="15"
layout="topleft"
left_delta="0"
name="note"
top_pad="0"
width="470"
wrap="true">
Note: your custom settings will not be visible to other users.
</text>
<!-- Water Setting -->
<text
name="water_settings_title"
follows="top|left"
height="16"
layout="topleft"
left="50"
top="40"
width="200">
Water Setting
</text>
<combo_box
follows="top|left"
left_pad="2"
name="water_settings_preset_combo"
top_delta="-5"
width="200">
<combo_box.item
label="-Select a preset-"
name="item0"/>
</combo_box>
<!-- Sky/Day Cycle Settings -->
<text
name="sky_dayc_settings_title"
follows="top|left"
height="16"
layout="topleft"
left="50"
top_pad="20"
width="100">
Sky / Day Cycle
</text>
<radio_group
layout="topleft"
left_delta="50"
name="sky_dayc_settings_radio_group"
top_pad="10"
height="50"
width="150">
<radio_item
layout="topleft"
label="Fixed sky"
name="my_sky_settings"/>
<radio_item
layout="topleft"
label="Day cycle"
name="my_dayc_settings"
top_pad="25"/>
</radio_group>
<combo_box
follows="top|left"
left_pad="2"
name="sky_settings_preset_combo"
top_delta="-7"
width="200">
<combo_box.item
label="-Select a preset-"
name="item0"/>
</combo_box>
<combo_box
follows="top|left"
name="dayc_settings_preset_combo"
top_delta="36"
width="200">
<combo_box.item
label="-Select a preset-"
name="item0"/>
</combo_box>
</panel>
<button
follows="left|top"
height="23"
label="OK"
layout="topleft"
right="-130"
name="ok_btn"
top_pad="10"
width="100" />
<button
follows="left|top"
height="23"
label="Cancel"
layout="topleft"
left_pad="10"
name="cancel_btn"
width="100" />
</floater>

2
indra/newview/skins/default/xui/en/floater_region_info.xml
View File

@ -16,5 +16,5 @@
name="region_panels"
right="-1"
tab_position="top"
top="20" />
top="20"/>
</floater>

117
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -480,7 +480,7 @@
<menu_item_separator/>
<menu
<menu
create_jump_keys="true"
label="Sun"
name="Environment Settings"
@ -515,24 +515,105 @@
function="World.EnvSettings"
parameter="midnight" />
</menu_item_call>
<menu_item_call
label="Estate Time"
name="Revert to Region Default">
<menu_item_call.on_click
function="World.EnvSettings"
parameter="default" />
</menu_item_call>
<menu_item_separator/>
<menu_item_call
label="Environment Editor"
name="Environment Editor">
<menu_item_call.on_click
function="World.EnvSettings"
parameter="editor" />
</menu_item_call>
</menu>
<menu
create_jump_keys="true"
label="Enviroment Editor"
name="Enviroment Editor"
tear_off="true">
<menu_item_call
label="Enviroment Settings..."
name="Enviroment Settings">
<menu_item_call.on_click
function="World.EnvSettings"
parameter="editor"/>
</menu_item_call>
<menu_item_separator/>
<menu
name="Water Presets"
label="Water Presets">
<menu_item_call
label="New preset..."
name="new_water_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="new_water"/>
</menu_item_call>
<menu_item_call
label="Edit preset..."
name="edit_water_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="edit_water"/>
</menu_item_call>
<menu_item_call
label="Delete preset..."
name="delete_water_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="delete_water"/>
</menu_item_call>
</menu>
<menu
name="Sky Presets"
label="Sky Presets">
<menu_item_call
label="New preset..."
name="new_sky_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="new_sky"/>
</menu_item_call>
<menu_item_call
label="Edit preset..."
name="edit_sky_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="edit_sky"/>
</menu_item_call>
<menu_item_call
label="Delete preset..."
name="delete_sky_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="delete_sky"/>
</menu_item_call>
</menu>
<menu
name="Day Presets"
label="Day Presets">
<menu_item_call
label="New preset..."
name="new_day_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="new_day_cycle"/>
</menu_item_call>
<menu_item_call
label="Edit preset..."
name="edit_day_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="edit_day_cycle"/>
</menu_item_call>
<menu_item_call
label="Delete preset..."
name="delete_day_preset">
<menu_item_call.on_click
function="World.EnvPreset"
parameter="delete_day_cycle"/>
</menu_item_call>
</menu>
</menu>
</menu>
<menu
create_jump_keys="true"

120
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -4852,18 +4852,6 @@ Do you wish to overwrite the saved preset?
yestext="Yes"/>
</notification>
<notification
icon="alertmodal.tga"
name="WLDeletePresetAlert"
type="alertmodal">
Do you wish to delete [SKY]?
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
notext="No"
yestext="Yes"/>
</notification>
<notification
icon="alertmodal.tga"
name="WLNoEditDefault"
@ -4880,6 +4868,46 @@ This day cycle file references a missing sky file: [SKY].
<tag>fail</tag>
</notification>
<notification
icon="alertmodal.tga"
name="WLRegionApplyFail"
type="alertmodal">
Sorry, the settings couldn't be applied to the region. Leaving the region and then returning may help rectify the problem. The reason given was: [FAIL_REASON]
</notification>
<notification
functor="GenericAcknowledge"
icon="alertmodal.tga"
name="EnvCannotDeleteLastDayCycleKey"
type="alertmodal">
Unable to delete the last key in this day cycle because you cannot have an empty day cycle. You should modify the last remaining key instead of attempting to delete it and then to create a new one.
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
functor="GenericAcknowledge"
icon="alertmodal.tga"
name="DayCycleTooManyKeyframes"
type="alertmodal">
You cannot add any more keyframes to this day cycle. The maximum number of keyframes for day cycles of [SCOPE] scope is [MAX].
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
functor="GenericAcknowledge"
icon="alertmodal.tga"
name="EnvUpdateRate"
type="alertmodal">
You may only update region environmental settings every [WAIT] seconds. Wait at least that long and then try again.
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="PPSaveEffectAlert"
@ -4891,74 +4919,6 @@ PostProcess Effect exists. Do you still wish overwrite it?
yestext="Yes"/>
</notification>
<notification
icon="alert.tga"
name="NewSkyPreset"
type="alert">
Give me a name for the new sky.
<tag>confirm</tag>
<form name="form">
<input name="message" type="text">
New Preset
</input>
<button
default="true"
index="0"
name="OK"
text="OK"/>
<button
index="1"
name="Cancel"
text="Cancel"/>
</form>
</notification>
<notification
icon="alertmodal.tga"
name="ExistsSkyPresetAlert"
type="alertmodal">
Preset already exists!
<tag>fail</tag>
</notification>
<notification
icon="alert.tga"
name="NewWaterPreset"
type="alert">
Give me a name for the new water preset.
<tag>confirm</tag>
<form name="form">
<input name="message" type="text">
New Preset
</input>
<button
default="true"
index="0"
name="OK"
text="OK"/>
<button
index="1"
name="Cancel"
text="Cancel"/>
</form>
</notification>
<notification
icon="alertmodal.tga"
name="ExistsWaterPresetAlert"
type="alertmodal">
Preset already exists!
<tag>fail</tag>
</notification>
<notification
icon="alertmodal.tga"
name="WaterNoEditDefault"
type="alertmodal">
You cannot edit or delete a default preset.
<tag>fail</tag>
</notification>
<notification
icon="alertmodal.tga"
name="ChatterBoxSessionStartError"

149
indra/newview/skins/default/xui/en/panel_region_environment.xml Normal file
View File

@ -0,0 +1,149 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
follows="top|left"
height="300"
label="Environment"
layout="topleft"
help_topic="panel_region_environment_tab"
name="panel_env_info"
width="530">
<text
name="water_settings_title"
follows="top|left"
height="30"
layout="topleft"
left="50"
top_pad="20"
width="430"
wrap="true">
Select the Water and Sky/Day Cycle Settings you would like all visitors to your region to see. More info
</text>
<view_border
bevel_style="none"
follows="top|left"
height="237"
layout="topleft"
left="50"
name="border"
top="60"
width="430"/>
<radio_group
follows="top|left"
height="45"
layout="topleft"
left_delta="10"
name="region_settings_radio_group"
top_delta="20"
width="200">
<radio_item
label="Use Second Life default"
layout="topleft"
name="use_sl_default_settings"/>
<radio_item
label="Use the following settings"
layout="topleft"
name="use_my_settings"
top_pad="20"/>
</radio_group>
<panel
follows="top|left"
height="150"
layout="topleft"
left="50"
name="user_environment_settings"
top_pad="20"
width="430">
<text
name="water_settings_title"
follows="top|left"
height="16"
layout="topleft"
left="50"
top_pad="0"
width="160">
Water Setting
</text>
<combo_box
follows="top|left"
left_pad="2"
name="water_settings_preset_combo"
top_delta="-7"
width="200">
<combo_box.item
label="-Select a preset-"
name="item0"/>
</combo_box>
<text
name="sky_dayc_settings_title"
follows="top|left"
height="16"
layout="topleft"
left="50"
top_pad="30"
width="100">
Sky / Day Cycle
</text>
<radio_group
layout="topleft"
left_delta="50"
name="sky_dayc_settings_radio_group"
top_pad="10"
height="50"
width="110">
<radio_item
layout="topleft"
label="Fixed sky"
name="my_sky_settings"/>
<radio_item
layout="topleft"
label="Day cycle"
name="my_dayc_settings"
top_pad="25"/>
</radio_group>
<combo_box
follows="top|left"
left_pad="2"
name="sky_settings_preset_combo"
top_delta="-7"
width="200">
<combo_box.item
label="-Select a preset-"
name="item0"/>
</combo_box>
<combo_box
follows="top|left"
name="dayc_settings_preset_combo"
top_delta="36"
width="200">
<combo_box.item
label="-Select a preset-"
name="item0"/>
</combo_box>
</panel>
<button
follows="left|top"
height="23"
label="Apply"
layout="topleft"
right="-160"
name="apply_btn"
top_pad="10"
width="100" />
<button
follows="left|top"
height="23"
label="Cancel"
layout="topleft"
left_pad="10"
name="cancel_btn"
width="100" />
<loading_indicator
height="23"
left="50"
name="progress_indicator"
top_delta="0"
visible="false"
width="23" />
</panel>

337
indra/newview/skins/default/xui/en/panel_region_estate.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="false"
border="true"
follows="top|left"
height="510"
help_topic="panel_region_estate_tab"
@ -20,7 +20,7 @@
name="estate_help_text"
top="14"
word_wrap="true"
width="300">
>
Changes to settings on this tab will affect all regions in the estate.
</text>
<text
@ -30,9 +30,10 @@
font="SansSerif"
height="20"
layout="topleft"
left_delta="0"
right="160"
name="estate_text"
top_pad="2"
halign="right"
width="140">
Estate:
</text>
@ -43,9 +44,9 @@
font="SansSerif"
height="20"
layout="topleft"
left_delta="0"
top_delta="0"
name="estate_name"
top_delta="16"
left_pad="6"
width="150">
(unknown)
</text>
@ -56,9 +57,10 @@
font="SansSerif"
height="20"
layout="topleft"
left_delta="0"
right="160"
name="owner_text"
top_pad="2"
top_pad="6"
halign="right"
width="150">
Estate owner:
</text>
@ -69,66 +71,40 @@
font="SansSerif"
height="20"
layout="topleft"
left_delta="0"
top_delta="0"
name="estate_owner"
top_delta="16"
left_pad="6"
use_ellipses="true"
width="290">
(unknown)
</text>
<view_border
bevel_style="in"
follows="top|left"
height="270"
layout="topleft"
left_delta="-4"
top_pad="5"
width="300" />
<check_box
height="20"
label="Use Global Time"
layout="topleft"
left="12"
name="use_global_time_check"
top="132"
width="200" />
<check_box
height="20"
label="Fixed Sun"
layout="topleft"
left="12"
name="fixed_sun_check"
top="152"
width="100" />
<icon
height="20"
image_name="icon_day_cycle.tga"
layout="topleft"
left="47"
name="daycycle"
top="177"
width="165" />
<slider
follows="left|top"
height="20"
increment="0.001"
label="Phase"
layout="topleft"
left="12"
max_val="30"
min_val="6"
name="sun_hour_slider"
show_text="false"
top="202"
width="200" />
<check_box
height="20"
label="Allow Public Access"
layout="topleft"
left_delta="0"
left="10"
name="externally_visible_check"
top_pad="6"
width="200" />
<check_box
height="20"
label="Allow Voice Chat"
layout="topleft"
left="280"
name="voice_chat_check"
top_delta="0"
width="200" />
<check_box
height="20"
label="Allow Direct Teleport"
layout="topleft"
left_delta="0"
name="allow_direct_teleport"
top_pad="4"
width="80" />
<text
type="string"
length="1"
@ -137,7 +113,7 @@
layout="topleft"
left="32"
name="Only Allow"
top="250"
top_delta="0"
width="278">
Restrict Access to accounts verified by:
</text>
@ -161,50 +137,6 @@
tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
top_pad="2"
width="278" />
<check_box
height="20"
label="Allow Voice Chat"
layout="topleft"
left="12"
name="voice_chat_check"
top="304"
width="200" />
<check_box
height="20"
label="Allow Direct Teleport"
layout="topleft"
left="12"
name="allow_direct_teleport"
top_pad="4"
width="80" />
<button
enabled="false"
follows="left|top"
height="23"
label="Apply"
layout="topleft"
name="apply_btn"
top_pad="10"
left="110"
width="97" />
<button
follows="left|top"
height="23"
label="Send Message To Estate..."
layout="topleft"
left="45"
name="message_estate_btn"
top_pad="20"
width="220" />
<button
follows="left|top"
height="23"
label="Kick Resident from Estate..."
layout="topleft"
left="45"
name="kick_user_from_estate_btn"
top_pad="5"
width="220" />
<text
type="string"
@ -214,16 +146,31 @@
height="20"
layout="topleft"
name="estate_manager_label"
right="520"
top_pad="10"
left="10"
width="200">
Estate Managers:
</text>
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="280"
name="allow_resident_label"
top_delta="0"
width="200">
Allowed Residents:
</text>
<!-- Estate Managers box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
right="520"
left="10"
top_pad="-5"
width="200" />
<name_list
@ -235,43 +182,15 @@
name="estate_manager_name_list"
top_delta="0"
width="200" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_estate_manager_btn"
right="520"
top_pad="5"
width="97" />
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left_delta="-103"
name="add_estate_manager_btn"
top_delta="0"
width="97" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left_delta="0"
name="allow_resident_label"
top_pad="10"
width="200">
Allowed Residents:
</text>
<!-- Allowed Residents box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
right="520"
top_pad="-5"
left="280"
top_delta="0"
width="200" />
<name_list
follows="left|top"
@ -282,42 +201,78 @@
name="allowed_avatar_name_list"
top_delta="0"
width="200" />
<!-- Estate Managers buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_estate_manager_btn"
top_pad="6"
width="97" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_estate_manager_btn"
left_pad="6"
width="97" />
<!-- Allowed Residents buttons -->
<button
follows="left|top"
height="23"
left="280"
label="Add..."
layout="topleft"
name="add_allowed_avatar_btn"
top_delta="0"
width="97" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_avatar_btn"
right="520"
top_pad="5"
width="97" />
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left_delta="-103"
name="add_allowed_avatar_btn"
left_pad="6"
top_delta="0"
width="97" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left_delta="0"
left="10"
name="allow_group_label"
top_pad="10"
width="200">
Allowed Groups:
</text>
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="280"
name="ban_resident_label"
top_delta="0"
width="200">
Banned Residents:
</text>
<!-- Allowed Groups box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
right="520"
left="10"
top_pad="-5"
width="200" />
<name_list
@ -329,43 +284,15 @@
name="allowed_group_name_list"
top_delta="0"
width="200" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_group_btn"
right="520"
top_pad="5"
width="97" />
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left_delta="-103"
name="add_allowed_group_btn"
top_delta="0"
width="97" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left_delta="0"
name="ban_resident_label"
top_pad="10"
width="200">
Banned Residents:
</text>
<!-- Banned Residents box -->
<view_border
bevel_style="none"
follows="top|left"
height="71"
layout="topleft"
right="520"
top_pad="-5"
left="280"
top_delta="0"
width="200" />
<name_list
follows="left|top"
@ -376,22 +303,64 @@
name="banned_avatar_name_list"
top_delta="0"
width="200" />
<!-- Allowed Groups buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="10"
name="add_allowed_group_btn"
top_pad="6"
width="97" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_allowed_group_btn"
left_pad="6"
top_delta="0"
width="97" />
<!-- Banned Residents buttons -->
<button
follows="left|top"
height="23"
label="Add..."
layout="topleft"
left="280"
name="add_banned_avatar_btn"
top_delta="0"
width="97" />
<button
follows="left|top"
height="23"
label="Remove..."
layout="topleft"
name="remove_banned_avatar_btn"
right="520"
top_pad="5"
top_delta="0"
left_pad="6"
width="97" />
<button
follows="left|top"
height="23"
label="Add..."
label="Send Message To Estate..."
layout="topleft"
left_delta="-103"
name="add_banned_avatar_btn"
left="10"
name="message_estate_btn"
top_pad="20"
width="220" />
<button
follows="left|top"
height="23"
label="Kick Resident from Estate..."
layout="topleft"
left="280"
name="kick_user_from_estate_btn"
top_delta="0"
width="97" />
width="220" />
</panel>

363
indra/newview/skins/default/xui/en/panel_region_terrain.xml
View File

@ -2,7 +2,7 @@
<panel
border="true"
follows="top|left"
height="320"
height="460"
help_topic="panel_region_terrain_tab"
label="Terrain"
layout="topleft"
@ -50,10 +50,10 @@
label="Terrain Raise Limit"
label_width="120"
layout="topleft"
left="15"
left="240"
max_val="100"
name="terrain_raise_spin"
top="60"
top="40"
width="180" />
<spinner
follows="left|top"
@ -62,95 +62,336 @@
label="Terrain Lower Limit"
label_width="120"
layout="topleft"
left="15"
left="240"
max_val="0"
min_val="-100"
name="terrain_lower_spin"
top="80"
top="60"
width="180" />
<check_box
height="20"
label="Use Estate Sun"
layout="topleft"
left="250"
name="use_estate_sun_check"
top="35"
width="100" />
<check_box
height="20"
label="Fixed Sun"
layout="topleft"
left="250"
name="fixed_sun_check"
top="55"
width="100" />
<icon
height="20"
image_name="icon_day_cycle.tga"
layout="topleft"
left="285"
name="daycycle"
top="80"
width="165" />
<slider
follows="left|top"
height="20"
increment="0.001"
label="Phase"
layout="topleft"
left="250"
max_val="30"
min_val="6"
name="sun_hour_slider"
show_text="false"
top="105"
width="200" />
<button
enabled="false"
follows="left|top"
height="20"
label="Apply"
layout="topleft"
left="350"
name="apply_btn"
top="135"
width="90" />
<view_border
bevel_style="none"
follows="top|left"
height="130"
height="60"
layout="topleft"
left="8"
top="30"
width="460" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="detail_texture_text"
top="110"
width="300">
Terrain Textures (requires 512x512, 24 bit .tga files)
</text>
<texture_picker
follows="left|top"
height="100"
layout="topleft"
left_delta="0"
name="texture_detail_0"
top_delta="20"
width="100" />
<texture_picker
follows="left|top"
height="100"
layout="topleft"
left_pad="10"
name="texture_detail_1"
top_delta="0"
width="100" />
<texture_picker
follows="left|top"
height="100"
layout="topleft"
left_pad="10"
name="texture_detail_2"
top_delta="0"
width="100" />
<texture_picker
follows="left|top"
height="100"
layout="topleft"
left_pad="10"
name="texture_detail_3"
top_delta="0"
width="100" />
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="height_text_lbl"
top_delta="90"
width="65">
1 (Low)
</text>
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left_pad="45"
name="height_text_lbl2"
top_delta="0"
width="100">
2
</text>
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left_pad="10"
name="height_text_lbl3"
top_delta="0"
width="100">
3
</text>
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left_pad="10"
name="height_text_lbl4"
top_delta="0"
width="100">
4 (High)
</text>
<text
type="string"
length="1"
follows="left|top"
height="20"
layout="topleft"
left="10"
name="height_text_lbl5"
top_delta="30"
width="300">
Texture Elevation Ranges
</text>
<text
follows="left|top"
height="20"
layout="topleft"
left="10"
name="height_text_lbl10"
top_delta="30"
width="200"
word_wrap="true">
These values represent the blend range for the textures above.
</text>
<text
follows="left|top"
height="20"
layout="topleft"
left_delta="0"
name="height_text_lbl11"
top_delta="32"
width="200"
word_wrap="true">
Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
</text>
<text
follows="left|top"
height="20"
layout="topleft"
left="270"
name="height_text_lbl6"
top="250"
width="100">
Northwest
</text>
<text
follows="left|top"
height="20"
layout="topleft"
left_pad="10"
name="height_text_lbl7"
top_delta="0"
width="100">
Northeast
</text>
<!-- northwest low-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="Low"
label_width="37"
layout="topleft"
left="230"
max_val="500"
min_val="-500"
name="height_start_spin_1"
top_delta="15"
width="100" />
<!-- northeast low-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="Low"
label_width="37"
layout="topleft"
left_pad="10"
max_val="500"
min_val="-500"
name="height_start_spin_3"
top_delta="0"
width="100" />
<!-- northwest high-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="High"
label_width="37"
layout="topleft"
left="230"
max_val="500"
min_val="-500"
name="height_range_spin_1"
top_delta="20"
width="100" />
<!-- northeast high-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="High"
label_width="37"
layout="topleft"
left_pad="10"
max_val="500"
min_val="-500"
name="height_range_spin_3"
top_delta="0"
width="100" />
<text
follows="left|top"
height="20"
layout="topleft"
left="270"
name="height_text_lbl8"
top_pad="10"
width="100">
Southwest
</text>
<text
follows="left|top"
height="20"
layout="topleft"
left_pad="10"
name="height_text_lbl9"
top_delta="0"
width="100">
Southeast
</text>
<!-- southwest low-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="Low"
label_width="37"
layout="topleft"
left="230"
max_val="500"
min_val="-500"
name="height_start_spin_0"
top_delta="15"
width="100" />
<!-- southeast low-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="Low"
label_width="37"
layout="topleft"
left_pad="10"
max_val="500"
min_val="-500"
name="height_start_spin_2"
top_delta="0"
width="100" />
<!--southwest high-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="High"
label_width="37"
layout="topleft"
left="230"
max_val="500"
min_val="-500"
name="height_range_spin_0"
top_delta="20"
width="100" />
<!-- southeast high-->
<spinner
follows="left|top"
height="20"
increment="0.5"
label="High"
label_width="37"
layout="topleft"
left_pad="10"
max_val="500"
min_val="-500"
name="height_range_spin_2"
top_delta="0"
width="100" />
<!-- Terrain Download/Upload/Bake buttons -->
<button
follows="left|top"
height="20"
label="Download RAW terrain..."
layout="topleft"
left_delta="2"
left="10"
name="download_raw_btn"
tool_tip="Available only to estate owners, not managers"
top_pad="60"
width="170" />
top="390"
width="160" />
<button
follows="left|top"
height="20"
label="Upload RAW terrain..."
layout="topleft"
left="10"
left_pad="10"
top_delta="0"
name="upload_raw_btn"
tool_tip="Available only to estate owners, not managers"
top="243"
width="170" />
width="160" />
<button
follows="left|top"
height="20"
label="Bake Terrain"
layout="topleft"
left="10"
left_pad="10"
name="bake_terrain_btn"
tool_tip="Set current terrain as mid-point for raise/lower limits"
top="283"
width="100" />
<button
enabled="true"
follows="left|top"
height="20"
label="Apply"
layout="topleft"
left_delta="0"
name="apply_btn"
top="430"
width="100" />
</panel>

4
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2355,6 +2355,10 @@ Returns a string with the requested data about the region
<string name="GroupOwned">Group Owned</string>
<string name="Public">Public</string>
<!-- Environment settings -->
<string name="LocalSettings">Local Settings</string>
<string name="RegionSettings">Region Settings</string>
<!-- panel classified -->
<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>

16
indra/newview/skins/default/xui/en/widgets/time.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<time text_enabled_color="LabelTextColor"
text_disabled_color="LabelDisabledColor"
font="SansSerifSmall"
label_width="40" >
<time.up_button name="SpinCtrl Up"
image_unselected="Stepper_Up_Off"
image_selected="Stepper_Up_Press"
tab_stop="false"
follows="left|bottom" />
<time.down_button name="SpinCtrl Down"
image_unselected="Stepper_Down_Off"
image_selected="Stepper_Down_Press"
tab_stop="false"
follows="left|bottom" />
</time>