summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/icons/Presets_Icon_Camera.pngbin0 -> 1381 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png (renamed from indra/newview/skins/default/textures/icons/Presets_Icon.png)bin366 -> 366 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml38
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml16
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_move.xml123
-rw-r--r--indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml69
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml14
9 files changed, 240 insertions, 25 deletions
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
new file mode 100644
index 0000000000..8cb51cdc8e
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png
index 5a6628816b..5a6628816b 100644
--- a/indra/newview/skins/default/textures/icons/Presets_Icon.png
+++ b/indra/newview/skins/default/textures/icons/Presets_Icon_Graphic.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f2da22256c..de9ed4d479 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -205,7 +205,8 @@ with the same filename but different name
<texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
- <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" />
+ <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
+ <texture name="Presets_Icon_Camera" file_name="icons/Presets_Icon_Camera.png" preload="true" />
<texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
<texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 521389d7b3..4eec922915 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -150,8 +150,26 @@
left="0"
mouse_opaque="false"
name="zoom"
- top="20"
+ top="0"
width="226">
+ <slider
+ can_edit_text="true"
+ control_name="CameraAngle"
+ decimal_digits="2"
+ follows="left|top"
+ height="16"
+ top="20"
+ increment="0.025"
+ initial_value="1.57"
+ layout="topleft"
+ label_width="112"
+ label="View angle"
+ left="10"
+ max_val="1.6"
+ min_val="0.17"
+ name="camera_fov"
+ show_text="false"
+ width="200" />
<joystick_rotate
follows="top|left"
height="78"
@@ -162,7 +180,7 @@
sound_flags="3"
visible="true"
tool_tip="Orbit camera around focus"
- top="20"
+ top_delta="20"
width="78" />
<button
follows="top|left"
@@ -174,7 +192,7 @@
left_pad="14"
name="zoom_plus_btn"
width="18"
- top="18">
+ top="38">
<commit_callback
function="Zoom.plus" />
<mouse_held_callback
@@ -219,7 +237,7 @@
scale_image="false"
sound_flags="3"
tool_tip="Move camera up and down, left and right"
- top="20"
+ top="40"
width="78"/>
</panel>
</panel>
@@ -270,5 +288,17 @@
tool_tip="Camera modes"
width="25">
</button>
+
+ <button
+ name="open_prefs_btn"
+ image_overlay="Icon_Gear_Foreground"
+ tool_tip = "Open view preferences"
+ left_pad="45"
+ height="22"
+ width="28">
+ <button.commit_callback
+ function="Presets.GoViewPrefs" />
+ </button>
+
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 9a9101e0da..cbaeae5b94 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -79,7 +79,7 @@
help_topic="preferences_chat_tab"
name="chat" />
<panel
- class="panel_preference"
+ class="panel_preference_view"
filename="panel_preferences_move.xml"
label="Move &amp; View"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 32cbbff8b7..f0979915ce 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -266,6 +266,21 @@
0
</text>
+<text
+type="string"
+length="1"
+follows="left|top"
+height="16"
+layout="topleft"
+left_delta="68"
+name="IndirectMaxComplexityLink"
+mouse_opaque="false"
+top_delta="0"
+width="120">
+[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 What's this?]
+</text>
+
+
<check_box
control_name="WindLightUseAtmosShaders"
height="16"
@@ -323,7 +338,6 @@
function="Pref.PrefLoad"
parameter="graphic"/>
</button>
- min_val="0.125"
<button
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8794e3bf95..e4a5f5e283 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -2,13 +2,14 @@
<panel
border="true"
follows="left|top|right|bottom"
- height="408"
+ height="418"
label="Move"
layout="topleft"
left="102"
name="move_panel"
top="1"
width="517">
+
<icon
follows="left|top"
height="18"
@@ -19,19 +20,41 @@
visible="true"
width="18"
left="30"
- top="10"/>
+ top="4"/>
+
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left="80"
+ top_delta="0"
+ width="100">
+ Preset in use:
+ </text>
+
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left_delta="100"
+ name="preset_camera_text"
+ width="120">
+ (None)
+ </text>
+
<slider
can_edit_text="true"
control_name="CameraAngle"
decimal_digits="2"
follows="left|top"
height="16"
+ top_pad="5"
increment="0.025"
initial_value="1.57"
layout="topleft"
label_width="100"
label="View angle"
- left_pad="30"
+ left="80"
max_val="2.97"
min_val="0.17"
name="camera_fov"
@@ -62,21 +85,38 @@
height="10"
left="80"
name="heading2"
- width="270"
+ width="200"
top_pad="5">
Automatic position for:
</text>
+
+ <spinner
+ control_name="CameraOpacity"
+ decimal_digits="1"
+ follows="top|left|right"
+ height="24"
+ max_val="1.0"
+ min_val="0.0"
+ increment="0.1"
+ initial_value="1.0"
+ label="Camera controls opacity:"
+ label_width="180"
+ layout="topleft"
+ top_pad="-10"
+ left_pad="10"
+ width="220" />
+
<check_box
control_name="EditCameraMovement"
height="20"
follows="left|top"
label="Build/Edit"
layout="topleft"
- left_delta="30"
+ left="100"
name="edit_camera_movement"
tool_tip="Use automatic camera positioning when entering and exiting edit mode"
width="280"
- top_pad="5" />
+ top_pad="-10" />
<check_box
control_name="AppearanceCameraMovement"
follows="left|top"
@@ -86,16 +126,68 @@
name="appearance_camera_movement"
tool_tip="Use automatic camera positioning while in edit mode"
width="242" />
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Save settings as a preset..."
+ layout="topleft"
+ left="30"
+ name="PrefCameraSaveButton"
+ top_pad="10"
+ width="200">
+ <button.commit_callback
+ function="Pref.PrefSave"
+ parameter="camera" />
+ </button>
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Load preset..."
+ layout="topleft"
+ left_pad="10"
+ name="PrefCameraLoadButton"
+ top_delta="0"
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefLoad"
+ parameter="camera"/>
+ </button>
+
+ <button
+ follows="top|left"
+ height="23"
+ label="Delete preset..."
+ layout="topleft"
+ left_pad="10"
+ name="PrefCameraDeleteButton"
+ top_delta="0"
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefDelete"
+ parameter="camera"/>
+ </button>
+
+ <view_border
+ bevel_style="in"
+ follows="left|top|right"
+ height="0"
+ layout="topleft"
+ left="10"
+ top_pad="5"
+ width="500"/>
+
<icon
- follows="left|top"
- height="18"
- image_name="Move_Walk_Off"
+ follows="left|top"
+ height="18"
+ image_name="Move_Walk_Off"
layout="topleft"
- name="avatar_icon"
- mouse_opaque="false"
- visible="true"
- width="18"
- top_pad="10"
+ name="avatar_icon"
+ mouse_opaque="false"
+ visible="true"
+ width="18"
+ top_pad="4"
left="30" />
<text
follows="left|top"
@@ -264,10 +356,11 @@
label="Other Devices"
left="30"
name="joystick_setup_button"
- top="30"
+ top_pad="5"
width="155">
<button.commit_callback
function="Floater.Show"
parameter="pref_joystick" />
</button>
+
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
new file mode 100644
index 0000000000..dc37270751
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_presets_camera_pulldown.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
+ border_visible="false"
+ border="false"
+ chrome="true"
+ follows="bottom"
+ height="155"
+ layout="topleft"
+ name="presets_camera_pulldown"
+ width="225">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ top="4"
+ left_delta="5"
+ font.style="BOLD"
+ name="Camera Presets"
+ width="120">
+ Camera Presets
+ </text>
+ <scroll_list
+ follows="left|top"
+ layout="topleft"
+ column_padding="0"
+ height="100"
+ width="215"
+ draw_heading="false"
+ draw_stripes="false"
+ bg_stripe_color="0.25 0.25 0.25 0.25"
+ top_delta="15"
+ left_delta="0"
+ name="preset_camera_list">
+ <scroll_list.columns
+ name="icon"
+ width="16" />
+ <scroll_list.columns
+ relative_width="1"
+ name="preset_name" />
+ <scroll_list.commit_callback
+ function="PresetsCamera.RowClick" />
+ </scroll_list>
+ <view_border
+ bevel_style="none"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="5"
+ name="horiz_separator"
+ top_delta="105"
+ width="215" />
+ <button
+ name="open_prefs_btn"
+ label="Open View Preferences"
+ tool_tip = "Bring up view preferences"
+ top_delta="5"
+ left="15"
+ height="20"
+ width="200">
+ <button.commit_callback
+ function="Presets.GoViewPrefs" />
+ </button>
+</panel>
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 998f1ce599..c6a42ea612 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,7 +35,7 @@
</panel.string>
<panel
height="18"
- left="-416"
+ left="-458"
width="185"
top="1"
follows="right|top"
@@ -108,10 +108,18 @@
<icon
follows="right|top"
height="16"
- image_name="Presets_Icon"
+ image_name="Presets_Icon_Camera"
left_pad="8"
top="2"
- name="presets_icon"
+ name="presets_icon_camera"
+ width="18" />
+ <icon
+ follows="right|top"
+ height="16"
+ image_name="Presets_Icon_Graphic"
+ left_pad="8"
+ top="2"
+ name="presets_icon_graphic"
width="18" />
<button
follows="right|top"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 06:28:58 +0000