Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -175,39 +175,39 @@
tool_tip="Camera spin around clockwise"
value="Clockwise" />
</rows>
<rows
<rows
name="roll_left"
value="roll_left">
<columns
<columns
column="lst_action"
font="SansSerif"
halign="left"
name="lst_action"
tool_tip="Camera roll left"
value="Roll Left" />
</rows>
<rows
</rows>
<rows
name="roll_right"
value="roll_right">
<columns
<columns
column="lst_action"
font="SansSerif"
halign="left"
name="lst_action"
tool_tip="Camera roll right"
value="Roll Right" />
</rows>
<rows
</rows>
<rows
name="roll_reset"
value="roll_reset">
<columns
<columns
column="lst_action"
font="SansSerif"
halign="left"
name="lst_action"
tool_tip="Reset camera roll"
value="Roll Reset" />
</rows>
</rows>
<rows
name="move_forward_sitting"
value="move_forward_sitting">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@
height="10"
layout="topleft"
left_delta="-5"
name="probe_ambiance_label"
tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
top_pad="15"
width="180">Reflection Probe Ambiance:</text>
<slider decimal_digits="2"
Expand Down
11 changes: 10 additions & 1 deletion indra/newview/skins/default/xui/en/panel_region_environment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
<string name="str_empty">(empty)</string>
<string name="str_region_env">(region environment)</string>

<layout_stack
<layout_stack
name="ls_main"
width="530"
height="400"
follows="all"
Expand Down Expand Up @@ -76,6 +77,7 @@
visible="true">
<layout_stack
follows="all"
name="ls_environment_config"
layout="topleft"
animate="false"
orientation="horizontal">
Expand All @@ -87,6 +89,7 @@
visible="true">
<layout_stack
follows="all"
name="ls_environment_current"
layout="topleft"
animate="false"
orientation="vertical">
Expand All @@ -97,6 +100,7 @@
bevel_style="in"
name="pnl_environment_current">
<text follows="top|left"
name="select_environment_label"
font="SansSerif"
halign="left"
text_color="white"
Expand Down Expand Up @@ -146,13 +150,15 @@
name="pnl_environment_length">
<text
font="SansSerif"
name="day_settings_label"
follows="top|left|right"
halign="left"
text_color="white"
left="5"
top="2">Day Settings</text>
<text
type="string"
name="day_length_label"
length="1"
follows="left|top"
height="12"
Expand All @@ -179,6 +185,7 @@
max_val="168" />
<text
type="string"
name="day_offset_label"
length="1"
follows="left|top"
height="12"
Expand All @@ -205,6 +212,7 @@
max_val="12" />
<text
type="string"
name="apparent_time_of_day_label"
length="1"
follows="left|top"
height="12"
Expand Down Expand Up @@ -381,6 +389,7 @@
</panel>
<text follows="top|left"
font="SansSerif"
name="sky_altitudes_label"
halign="left"
text_color="white"
left="5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,10 @@
layout="topleft"
left_delta="-5"
top_delta="25"
tool_tip="Irradiance control. When not zero, enables HDR lighting model."
name="probe_ambiance_label"
tool_tip="Intensity of environment based indirect lighting. At zero HDR scale becomes Brightness"
width="200">
Reflection Probe Ambiance (HDR):
Reflection Probe Ambiance:
</text>
<slider
decimal_digits="2"
Expand Down
6 changes: 3 additions & 3 deletions indra/newview/skins/default/xui/en/panel_teleport_history.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
height="150"
layout="topleft"
left="0"
name="2_days_ago"
name="2_days_ago_items"
top="0"
width="307">
</flat_list_view>
Expand All @@ -71,7 +71,7 @@
height="150"
layout="topleft"
left="0"
name="3_days_ago"
name="3_days_ago_items"
top="0"
width="307">
</flat_list_view>
Expand All @@ -85,7 +85,7 @@
height="150"
layout="topleft"
left="0"
name="4_days_ago"
name="4_days_ago_items"
top="0"
width="307">
</flat_list_view>
Expand Down
Loading