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

FIRE-32595 TPP preset is missing from camera floaters

master
PanteraPolnocy 2025-09-14 19:35:53 +02:00
parent 387f74e2a9
commit 3debcc1ca7
40 changed files with 128 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatercamera.cpp
View File

@ -754,6 +754,10 @@ void LLFloaterCamera::updateItemsSelection()
getChild<LLPanelCameraItem>("group_view")->setValue(argument);
argument["selected"] = (preset == CAMERA_PRESET_FRONT_VIEW) && !sFreeCamera;
getChild<LLPanelCameraItem>("front_view")->setValue(argument);
// <FS:PP> Third Person Perspective camera
argument["selected"] = (preset == CAMERA_PRESET_TPP_VIEW) && !sFreeCamera;
getChild<LLPanelCameraItem>("tpp_view")->setValue(argument);
// </FS:PP>
argument["selected"] = gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK;
getChild<LLPanelCameraItem>("mouselook_view")->setValue(argument);
argument["selected"] = mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA;

25
indra/newview/skins/ansastorm/xui/en/floater_camera.xml
View File

@ -20,7 +20,7 @@
title="Camera Controls"
chrome="true"
save_rect="true"
width="340">
width="360">
<floater.string
name="rotate_tooltip">
Rotate Camera Around Focus
@ -167,7 +167,7 @@
left_pad="2"
name="buttons_panel"
top_delta="18"
width="120">
width="140">
<panel_camera_item
name="front_view"
tool_tip="Front View"
@ -206,6 +206,19 @@
<panel_camera_item.selected_picture
image_name="Cam_Preset_Back_On" />
</panel_camera_item>
<panel_camera_item
name="tpp_view"
tool_tip="TPP View"
width="18"
left_pad="2">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="TPP View" />
<panel_camera_item.picture
image_name="Cam_Preset_TPP_Off" />
<panel_camera_item.selected_picture
image_name="Cam_Preset_TPP_On" />
</panel_camera_item>
<panel_camera_item
name="object_view"
tool_tip="Object View"
@ -252,7 +265,7 @@
mouse_opaque="true"
name="preset_combo"
top_pad="7"
width="116">
width="136">
<combo_list
mouse_wheel_opaque="true"/>
<combo_box.item
@ -279,10 +292,10 @@
height="23"
label="Position..."
layout="topleft"
left_delta="-119"
left_delta="-139"
name="camera_position_btn"
top_pad="5"
width="70">
width="80">
<button.commit_callback
function="Floater.Show"
parameter="prefs_view_advanced"/>
@ -295,7 +308,7 @@
left_pad="3"
name="save_btn"
top_delta="0"
width="70">
width="80">
<button.commit_callback
function="CameraPresets.Save"/>
</button>

1
indra/newview/skins/ansastorm/xui/pl/floater_camera.xml
View File

@ -28,6 +28,7 @@
<panel_camera_item name="front_view" tool_tip="Widok od przodu"/>
<panel_camera_item name="group_view" tool_tip="Widok ponad ramieniem"/>
<panel_camera_item name="rear_view" tool_tip="Widok od tyłu"/>
<panel_camera_item name="tpp_view" tool_tip="Widok trzecioosobowy"/>
<panel_camera_item name="object_view" tool_tip="Pokazywanie obiektu"/>
<panel_camera_item name="mouselook_view" tool_tip="Widok pierwszoosobowy"/>
<panel_camera_item name="reset_view" tool_tip="Resetuj widok"/>

BIN
indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

5
indra/newview/skins/default/textures/textures.xml
View File

@ -118,6 +118,11 @@ with the same filename but different name
<texture name="Cam_Preset_Side_Off" file_name="bottomtray/Cam_Preset_Side_Off.png" preload="false" />
<texture name="Cam_Preset_Side_On" file_name="bottomtray/Cam_Preset_Side_On.png" preload="false" />
<!-- FS:PP: Camera Third Person View -->
<texture name="Cam_Preset_TPP_Off" file_name="bottomtray/Cam_Preset_TPP_Off.png" preload="false" />
<texture name="Cam_Preset_TPP_On" file_name="bottomtray/Cam_Preset_TPP_On.png" preload="false" />
<!-- END FS:PP: Camera Third Person View -->
<texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
<texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />
<texture name="Cam_Rotate_Center" file_name="bottomtray/Cam_Rotate_Center.png" preload="false" />

23
indra/newview/skins/default/xui/en/floater_camera.xml
View File

@ -22,8 +22,8 @@
save_visibility="true"
show_title="false"
single_instance="true"
width="150"
min_width="135">
width="170"
min_width="155">
<floater.string name="rotate_tooltip">
Rotate Camera Around Focus
</floater.string>
@ -43,7 +43,7 @@
layout="topleft"
left="2"
name="buttons_panel"
width="120"
width="140"
top_pad="-5">
<panel_camera_item
name="front_view"
@ -78,6 +78,17 @@
<panel_camera_item.picture image_name="Cam_Preset_Back_Off" />
<panel_camera_item.selected_picture image_name="Cam_Preset_Back_On" />
</panel_camera_item>
<panel_camera_item
name="tpp_view"
tool_tip="TPP View"
width="18"
left_pad="2">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="TPP View" />
<panel_camera_item.picture image_name="Cam_Preset_TPP_Off" />
<panel_camera_item.selected_picture image_name="Cam_Preset_TPP_On" />
</panel_camera_item>
<panel_camera_item
name="object_view"
tool_tip="Object View"
@ -114,7 +125,7 @@
</panel>
<panel
border="false"
width="140"
width="160"
class="camera_zoom_panel"
height="60"
layout="topleft"
@ -278,7 +289,7 @@
layout="topleft"
left_delta="5"
name="camera_position_btn"
width="113">
width="133">
<button.commit_callback
function="Floater.Show"
parameter="prefs_view_advanced" />
@ -302,7 +313,7 @@
mouse_opaque="true"
name="preset_combo"
top_pad="0"
width="113">
width="133">
<combo_list mouse_wheel_opaque="true" />
<combo_box.item
label="Use preset"

45
indra/newview/skins/default/xui/en/floater_fs_camera_small.xml
View File

@ -20,8 +20,8 @@
save_visibility="true"
save_dock_state="false"
single_instance="true"
width="155"
min_width="155">
width="165"
min_width="165">
<floater.string
name="rotate_tooltip">
Rotate Camera Around Focus
@ -60,7 +60,7 @@ free_mode_title
name="zoom"
follows="all"
top="25"
width="150">
width="160">
<layout_stack
top="0"
@ -70,7 +70,7 @@ free_mode_title
mouse_opaque="true"
name="camera_view_layout_stack"
orientation="horizontal"
width="150"
width="160"
follows="all">
<layout_panel
@ -219,7 +219,7 @@ free_mode_title
top="0"
follows="top|left"
name="buttons_view"
width="56">
width="76">
<panel_camera_item
name="front_view"
tool_tip="Front view"
@ -324,6 +324,41 @@ free_mode_title
""
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item
name="tpp_view"
tool_tip="TPP view"
width="18"
height="18"
layout="topleft"
left_delta="20"
top_delta="0">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="TPP View" />
<panel_camera_item.icon_over
top="18"
height="18"
width="18" />
<panel_camera_item.icon_selected
top="18"
height="18"
width="18" />
<panel_camera_item.picture
top="18"
height="18"
width="18"
image_name="Cam_Preset_TPP_Off" />
<panel_camera_item.selected_picture
top="18"
height="18"
width="18"
image_name="Cam_Preset_TPP_On" />
<panel_camera_item.text
width="0"
name="tpp_view_text">
""
</panel_camera_item.text>
</panel_camera_item>
</panel>
<panel

35
indra/newview/skins/default/xui/en/floater_phototools_camera.xml
View File

@ -74,7 +74,7 @@
follows="all"
height="102"
layout="topleft"
left="10"
left="6"
name="preset_views_list"
top_pad="0"
right="-1"
@ -99,7 +99,7 @@
<panel_camera_item
name="group_view"
height="20"
top_pad="6">
top_pad="1">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="Side View"/>
@ -115,9 +115,8 @@
</panel_camera_item>
<panel_camera_item
name="rear_view"
layout="topleft"
height="20"
top_pad="6">
top_pad="1">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="Rear View"/>
@ -131,12 +130,30 @@
Rear View
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item
name="tpp_view"
layout="topleft"
height="20"
top_pad="1">
<panel_camera_item.mousedown_callback
function="CameraPresets.ChangeView"
parameter="TPP View"/>
<panel_camera_item.picture
image_name="Cam_Preset_TPP_Off"/>
<panel_camera_item.selected_picture
image_name="Cam_Preset_TPP_On"/>
<panel_camera_item.text
name="tpp_view_text"
top="22">
TPP View
</panel_camera_item.text>
</panel_camera_item>
<combo_box
height="23"
height="20"
left="0"
mouse_opaque="true"
name="preset_combo"
top_pad="1"
top_pad="-4"
width="122">
<combo_list
mouse_wheel_opaque="true"/>
@ -146,8 +163,8 @@
value="default" />
</combo_box>
<button
height="16"
width="16"
height="13"
width="13"
layout="topleft"
mouse_opaque="true"
name="gear_btn"
@ -163,7 +180,7 @@
</button>
<button
follows="top|left"
height="23"
height="20"
label="Position..."
layout="topleft"
left_pad="5"

1
indra/newview/skins/default/xui/pl/floater_camera.xml
View File

@ -19,6 +19,7 @@
<panel_camera_item name="front_view" tool_tip="Widok od przodu" />
<panel_camera_item name="group_view" tool_tip="Widok ponad ramieniem" />
<panel_camera_item name="rear_view" tool_tip="Widok od tyłu" />
<panel_camera_item name="tpp_view" tool_tip="Widok trzecioosobowy" />
<panel_camera_item name="object_view" tool_tip="Pokazywanie obiektu" />
<panel_camera_item name="mouselook_view" tool_tip="Widok pierwszoosobowy" />
<panel_camera_item name="reset_view" tool_tip="Resetuj widok" />

1
indra/newview/skins/default/xui/pl/floater_fs_camera_small.xml
View File

@ -31,6 +31,7 @@
<panel_camera_item name="front_view" tool_tip="Widok od przodu" />
<panel_camera_item name="group_view" tool_tip="Widok ponad ramieniem" />
<panel_camera_item name="rear_view" tool_tip="Widok od tyłu" />
<panel_camera_item name="tpp_view" tool_tip="Widok trzecioosobowy" />
</panel>
<panel name="buttons">
<panel_camera_item name="object_view" tool_tip="Pokazywanie obiektu" />

7
indra/newview/skins/default/xui/pl/floater_phototools_camera.xml
View File

@ -27,7 +27,7 @@
</panel_camera_item>
<panel_camera_item name="group_view">
<panel_camera_item.text name="side_view_text">
Widok znad ramienia
Widok ponad ramieniem
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item name="rear_view">
@ -35,6 +35,11 @@
Widok od tyłu
</panel_camera_item.text>
</panel_camera_item>
<panel_camera_item name="tpp_view">
<panel_camera_item.text name="tpp_view_text">
Widok trzecioosobowy
</panel_camera_item.text>
</panel_camera_item>
<combo_box name="preset_combo">
<combo_box.item label="Użyj ustawienia" name="Use preset" />
</combo_box>

BIN
indra/newview/skins/metaharper/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/metaharper/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

BIN
indra/newview/skins/metaharper/themes/appalachian_sky/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/metaharper/themes/appalachian_sky/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

2
indra/newview/skins/metaharper/themes/appalachian_sky/textures/textures.xml
View File

@ -90,6 +90,8 @@ with the same filename but different name
<texture name="Cam_Preset_Front_On" file_name="bottomtray/Cam_Preset_Front_On.png" preload="false" />
<texture name="Cam_Preset_Side_Off" file_name="bottomtray/Cam_Preset_Side_Off.png" preload="false" />
<texture name="Cam_Preset_Side_On" file_name="bottomtray/Cam_Preset_Side_On.png" preload="false" />
<texture name="Cam_Preset_TPP_Off" file_name="bottomtray/Cam_Preset_TPP_Off.png" preload="false" />
<texture name="Cam_Preset_TPP_On" file_name="bottomtray/Cam_Preset_TPP_On.png" preload="false" />
<texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
<texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />

BIN
indra/newview/skins/metaharper/themes/cool_ocean/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/metaharper/themes/cool_ocean/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

3
indra/newview/skins/metaharper/themes/cool_ocean/textures/textures.xml
View File

@ -90,7 +90,8 @@ with the same filename but different name
<texture name="Cam_Preset_Front_On" file_name="bottomtray/Cam_Preset_Front_On.png" preload="false" />
<texture name="Cam_Preset_Side_Off" file_name="bottomtray/Cam_Preset_Side_Off.png" preload="false" />
<texture name="Cam_Preset_Side_On" file_name="bottomtray/Cam_Preset_Side_On.png" preload="false" />
<texture name="Cam_Preset_TPP_Off" file_name="bottomtray/Cam_Preset_TPP_Off.png" preload="false" />
<texture name="Cam_Preset_TPP_On" file_name="bottomtray/Cam_Preset_TPP_On.png" preload="false" />
<texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
<texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />
<texture name="Cam_Tracking_In" file_name="bottomtray/Cam_Tracking_In.png" preload="false" />

2
indra/newview/skins/starlight/textures/textures.xml
View File

@ -111,6 +111,8 @@ with the same filename but different name
<texture name="Cam_Preset_Front_On" file_name="bottomtray/Cam_Preset_Front_On.png" preload="false" />
<texture name="Cam_Preset_Side_Off" file_name="bottomtray/Cam_Preset_Side_Off.png" preload="false" />
<texture name="Cam_Preset_Side_On" file_name="bottomtray/Cam_Preset_Side_On.png" preload="false" />
<texture name="Cam_Preset_TPP_Off" file_name="bottomtray/Cam_Preset_TPP_Off.png" preload="false" />
<texture name="Cam_Preset_TPP_On" file_name="bottomtray/Cam_Preset_TPP_On.png" preload="false" />
<texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
<texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />

BIN
indra/newview/skins/starlight/themes/mono_teal/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlight/themes/mono_teal/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

BIN
indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 424 B

BIN
indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 B

BIN
indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 B

BIN
indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlightcui/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 B

BIN
indra/newview/skins/starlightcui/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 B

3
indra/newview/skins/starlightcui/textures/textures.xml
View File

@ -111,7 +111,8 @@ with the same filename but different name
<texture name="Cam_Preset_Front_On" file_name="bottomtray/Cam_Preset_Front_On.png" preload="false" />
<texture name="Cam_Preset_Side_Off" file_name="bottomtray/Cam_Preset_Side_Off.png" preload="false" />
<texture name="Cam_Preset_Side_On" file_name="bottomtray/Cam_Preset_Side_On.png" preload="false" />
<texture name="Cam_Preset_TPP_Off" file_name="bottomtray/Cam_Preset_TPP_Off.png" preload="false" />
<texture name="Cam_Preset_TPP_On" file_name="bottomtray/Cam_Preset_TPP_On.png" preload="false" />
<texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
<texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />
<texture name="Cam_Tracking_In" file_name="bottomtray/Cam_Tracking_In.png" preload="false" />

BIN
indra/newview/skins/starlightcui/themes/custom_dark/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 B

BIN
indra/newview/skins/starlightcui/themes/custom_dark/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1002 B

BIN
indra/newview/skins/starlightcui/themes/custom_light/textures/bottomtray/Cam_Preset_TPP_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
indra/newview/skins/starlightcui/themes/custom_light/textures/bottomtray/Cam_Preset_TPP_On.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB