summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml113
-rw-r--r--indra/newview/skins/default/xui/en/floater_mp_performance.xml (renamed from indra/newview/skins/default/xui/en/floater_mpv_performance.xml)13
-rw-r--r--indra/newview/skins/default/xui/en/floater_script.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml3
4 files changed, 74 insertions, 58 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 93b306d7d7..44a5638bc4 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -5,9 +5,11 @@
bottom="-50"
follows="left|bottom"
legacy_header_height="18"
- can_minimize="true"
+ can_minimize="false"
+ can_collapse="false"
can_close="true"
- height="135"
+ width="410"
+ height="114"
layout="topleft"
name="camera_floater"
help_topic="camera_floater"
@@ -15,8 +17,7 @@
single_instance="true"
title="CAMERA CONTROLS"
chrome="true"
- save_rect="true"
- width="400">
+ save_rect="true">
<floater.string
name="rotate_tooltip">
Rotate Camera Around Focus
@@ -36,18 +37,19 @@
<string name="inactive_combo_text">Use preset</string>
<panel
border="false"
- height="123"
+ width="220"
+ height="90"
layout="topleft"
left="2"
- top="0"
+ top="18"
mouse_opaque="false"
name="controls"
- width="220">
+ >
<!--TODO: replace + - images -->
<panel
border="false"
class="camera_zoom_panel"
- height="123"
+ height="90"
layout="topleft"
left="0"
mouse_opaque="false"
@@ -56,54 +58,59 @@
width="220">
<joystick_rotate
follows="top|left"
+ width="78"
height="78"
layout="topleft"
left="7"
+ top="8"
name="cam_rotate_stick"
quadrant="left"
sound_flags="3"
visible="true"
+ scale_image="true"
tool_tip="Orbit camera around focus"
- top="25"
- width="78" />
+ />
<button
follows="top|left"
+ width="18"
height="18"
+ left_pad="4"
+ top="2"
+ layout="topleft"
image_disabled="AddItem_Disabled"
image_selected="AddItem_Press"
image_unselected="AddItem_Off"
- layout="topleft"
- left_pad="14"
name="zoom_plus_btn"
- width="18"
- top="23">
+ >
<commit_callback
function="Zoom.plus" />
<mouse_held_callback
function="Zoom.plus" />
</button>
<slider_bar
+ width="18"
height="50"
+ top_pad="0"
layout="topleft"
name="zoom_slider"
orientation="vertical"
tool_tip="Zoom camera toward focus"
- top_pad="0"
min_val="0"
- max_val="1"
- width="18">
+ max_val="1"
+ >
<commit_callback function="Slider.value_changed"/>
</slider_bar>
<button
follows="top|left"
+ width="18"
height="18"
+ top_pad="0"
+ layout="topleft"
image_disabled="MinusItem_Disabled"
image_selected="MinusItem_Press"
image_unselected="MinusItem_Off"
- layout="topleft"
name="zoom_minus_btn"
- top_pad="0"
- width="18">
+ >
<commit_callback
function="Zoom.minus" />
<mouse_held_callback
@@ -111,35 +118,46 @@
</button>
<joystick_track
follows="top|left"
+ width="78"
height="78"
+ left_pad="4"
image_selected="Cam_Tracking_In"
image_unselected="Cam_Tracking_Out"
layout="topleft"
- left="133"
name="cam_track_stick"
quadrant="left"
- scale_image="false"
+ scale_image="true"
sound_flags="3"
tool_tip="Move camera up and down, left and right"
- top="25"
- width="78"/>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="15"
+ />
+ <button
+ follows="top|left"
+ width="18"
+ height="18"
+ top="8"
+ left_pad="6"
+ layout="topleft"
+ name="collapse_btn"
+ >
+ </button>
+ <button
+ follows="top|left"
+ width="18"
+ height="18"
+ top_pad="4"
layout="topleft"
- left="41"
- top_pad="9"
- name="precise_ctrs_label"
- width="200">
- Use precise controls
- </text>
+ name="precise_btn"
+ image_disabled="Cam_FreeCam_Off"
+ image_selected="Cam_FreeCam_Off"
+ image_unselected="Cam_FreeCam_Off"
+ tool_tip="Use precise controls"
+ >
+ </button>
</panel>
</panel>
<panel
follows="left|top"
- height="102"
+ height="90"
layout="topleft"
left_pad="2"
right="-2"
@@ -216,7 +234,7 @@
mouse_opaque="true"
name="preset_combo"
top_pad="10"
- width="136">
+ width="124">
<combo_list
mouse_wheel_opaque="true"/>
<combo_box.item
@@ -226,13 +244,13 @@
</combo_box>
<button
height="16"
- width="16"
+ width="16"
layout="topleft"
mouse_opaque="true"
name="gear_btn"
tool_tip="My Camera Presets"
top_delta="3"
- left_pad="10"
+ left_pad="10"
image_selected="Icon_Gear"
image_pressed="Icon_Gear"
image_unselected="Icon_Gear"
@@ -242,13 +260,16 @@
</button>
<button
follows="top|left"
- height="25"
- label="Save as preset..."
+ width="18"
+ height="18"
+ left_pad="4"
+ tooltip_text="Save as preset..."
layout="topleft"
- left="0"
name="save_preset_btn"
- top_pad="18"
- width="150">
+ image_disabled="Conv_toolbar_plus"
+ image_selected="Conv_toolbar_plus"
+ image_unselected="Conv_toolbar_plus"
+ >
<button.commit_callback
function="CameraPresets.Save"/>
</button>
@@ -259,7 +280,7 @@
top="135"
width="400"
height="150"
- border="true"
+ border="false"
visible="false"
background_visible="true"/>
<panel
@@ -268,7 +289,7 @@
top="285"
width="400"
height="150"
- border="true"
+ border="false"
visible="false"
background_visible="true"/>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
index 5c54d366f2..865ffe82cf 100644
--- a/indra/newview/skins/default/xui/en/floater_mpv_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
@@ -3,7 +3,7 @@
positioning="cascading"
legacy_header_height="40"
top="12"
- right="2"
+ right="-324"
height="120"
min_height="120"
width="320"
@@ -74,16 +74,11 @@
name="MPVBuffModeComboBox"
width="150"
height="23"
- left="120"
+ left="130"
top="4"
>
<combo_box.item
enabled="true"
- label="Auto"
- name="Auto"
- value="0" />
- <combo_box.item
- enabled="true"
label="Normal"
name="Normal"
value="1" />
@@ -94,8 +89,8 @@
value="2" />
<combo_box.item
enabled="true"
- label="Optimized+ (AMD GPU)"
- name="Optimized+"
+ label="Experimental"
+ name="Experimental"
value="3" />
</combo_box>
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index ae6e68de17..900319620d 100644
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -7,7 +7,8 @@
name="script_floater"
can_dock="true"
can_minimize="true"
- visible="false"
+ save_rect="true"
+ visible="false"
width="350"
can_resize="false"
min_width="350"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index f337ad9038..80fa230bba 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -188,13 +188,12 @@
<button
type="string"
font="SansSerif"
- text_color="FpsTextColor"
+ label_color="FpsTextColor"
follows="right|top"
halign="center"
valign="center"
height="18"
top="1"
- v_pad="0"
left_pad="4"
name="FpsText"
tool_tip="fps"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 20:56:49 +0000