From 3debcc1ca787b6e267461ef8e36247abac6d8549 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 14 Sep 2025 19:35:53 +0200 Subject: [PATCH] FIRE-32595 TPP preset is missing from camera floaters --- indra/newview/llfloatercamera.cpp | 4 ++ .../skins/ansastorm/xui/en/floater_camera.xml | 25 +++++++--- .../skins/ansastorm/xui/pl/floater_camera.xml | 1 + .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1055 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 424 bytes .../skins/default/textures/textures.xml | 5 ++ .../skins/default/xui/en/floater_camera.xml | 23 ++++++--- .../xui/en/floater_fs_camera_small.xml | 45 ++++++++++++++++-- .../xui/en/floater_phototools_camera.xml | 35 ++++++++++---- .../skins/default/xui/pl/floater_camera.xml | 1 + .../xui/pl/floater_fs_camera_small.xml | 1 + .../xui/pl/floater_phototools_camera.xml | 7 ++- .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1055 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 424 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1055 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 424 bytes .../appalachian_sky/textures/textures.xml | 2 + .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1055 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 424 bytes .../themes/cool_ocean/textures/textures.xml | 3 +- .../skins/starlight/textures/textures.xml | 2 + .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1054 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 1041 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1055 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 424 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1055 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 424 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1002 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 1002 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1054 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 1041 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1054 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 1041 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1002 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 1002 bytes .../skins/starlightcui/textures/textures.xml | 3 +- .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1002 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 1002 bytes .../bottomtray/Cam_Preset_TPP_Off.png | Bin 0 -> 1054 bytes .../textures/bottomtray/Cam_Preset_TPP_On.png | Bin 0 -> 1041 bytes 40 files changed, 128 insertions(+), 29 deletions(-) create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/metaharper/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/metaharper/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/metaharper/themes/appalachian_sky/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/metaharper/themes/appalachian_sky/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/metaharper/themes/cool_ocean/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/metaharper/themes/cool_ocean/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlight/themes/mono_teal/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlight/themes/mono_teal/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlightcui/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlightcui/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlightcui/themes/custom_dark/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlightcui/themes/custom_dark/textures/bottomtray/Cam_Preset_TPP_On.png create mode 100644 indra/newview/skins/starlightcui/themes/custom_light/textures/bottomtray/Cam_Preset_TPP_Off.png create mode 100644 indra/newview/skins/starlightcui/themes/custom_light/textures/bottomtray/Cam_Preset_TPP_On.png diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 73b7fa7c9c..eaacb6704f 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -754,6 +754,10 @@ void LLFloaterCamera::updateItemsSelection() getChild("group_view")->setValue(argument); argument["selected"] = (preset == CAMERA_PRESET_FRONT_VIEW) && !sFreeCamera; getChild("front_view")->setValue(argument); +// Third Person Perspective camera + argument["selected"] = (preset == CAMERA_PRESET_TPP_VIEW) && !sFreeCamera; + getChild("tpp_view")->setValue(argument); +// argument["selected"] = gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK; getChild("mouselook_view")->setValue(argument); argument["selected"] = mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA; diff --git a/indra/newview/skins/ansastorm/xui/en/floater_camera.xml b/indra/newview/skins/ansastorm/xui/en/floater_camera.xml index fede8909aa..6eea845370 100644 --- a/indra/newview/skins/ansastorm/xui/en/floater_camera.xml +++ b/indra/newview/skins/ansastorm/xui/en/floater_camera.xml @@ -20,7 +20,7 @@ title="Camera Controls" chrome="true" save_rect="true" - width="340"> + width="360"> Rotate Camera Around Focus @@ -167,7 +167,7 @@ left_pad="2" name="buttons_panel" top_delta="18" - width="120"> + width="140"> + + + + + + width="136"> + width="80"> @@ -295,7 +308,7 @@ left_pad="3" name="save_btn" top_delta="0" - width="70"> + width="80"> diff --git a/indra/newview/skins/ansastorm/xui/pl/floater_camera.xml b/indra/newview/skins/ansastorm/xui/pl/floater_camera.xml index 8e03199c8b..b0fcd6aa0d 100644 --- a/indra/newview/skins/ansastorm/xui/pl/floater_camera.xml +++ b/indra/newview/skins/ansastorm/xui/pl/floater_camera.xml @@ -28,6 +28,7 @@ + diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_Off.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4c49812610a61f27cf4e2ccf39f7173740ea5b GIT binary patch literal 1055 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*HX>Ff#=Bgt#hg^tpNS=AAotUc7iQ zbLPx<@7`UybZPzi_4n`J-@SYH$&)9yZ{Pm?`}cqU{(b)Z`Olv}KY#uNnlK7RLtuD> zK=|y089<*fmIV0)GdMiEkp|?P^>lFzu{eG9@@c*n1s>K5PHSCj&i=1|E27%x;3&5F zgPNLzzn3@51JRA!&hrYLKjWXrSHSR0z1lI-Jhw%__wKI;X*-_ePHbbcdG@dN`l&qa zs{HSZg7T*Ka!kyKJZ(EUyvXp!%5rh8UD{WgWVnLX+>+SQVybyz&M6bc(>lp5$4vdA zn`fnnI@v!dN*A5BiEZlH#y1vocgD-4%5D0$gL#gF>pg|E*rhiMMO4qXxc-lvvw$Id y#s6;35Wb!KPUdH_uPJ_Ue%JD$e#KV~{WIbQ-CT?ApHL_T#h0h6pUXO@geCy8xSJjT literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_TPP_On.png new file mode 100644 index 0000000000000000000000000000000000000000..315d26a02150aa1a2ba1cc22c5ad4e19b74cce7d GIT binary patch literal 424 zcmV;Z0ayNsP)Y(L@5}N$(lF%gUP5WPo>k-mei|!}H-lM!uR&#$yp_;q`Q+!U!}< zyJZGUSboFKAQ;wdUIs20i>j)~qrn(^5qTGUEeaKG>}~hx-U+b6mwQ#$b#XePZUoe_ zdNC@qWnhMH&k8UqM!-ghceEp$P}}&i8HRDNJV>H^JbAXKVw7c5#e=ls!x%*^SIn?( zGZs5O%(Ja|Vi|p@4;``#@;+O SSNyU70000 literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f72ee8694b..f72efb9fb2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -118,6 +118,11 @@ with the same filename but different name + + + + + diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index a0c73f4d64..6f40fccc6e 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -22,8 +22,8 @@ save_visibility="true" show_title="false" single_instance="true" - width="150" - min_width="135"> + width="170" + min_width="155"> Rotate Camera Around Focus @@ -43,7 +43,7 @@ layout="topleft" left="2" name="buttons_panel" - width="120" + width="140" top_pad="-5"> + + + + + + width="133"> @@ -302,7 +313,7 @@ mouse_opaque="true" name="preset_combo" top_pad="0" - width="113"> + width="133"> + width="165" + min_width="165"> Rotate Camera Around Focus @@ -60,7 +60,7 @@ free_mode_title name="zoom" follows="all" top="25" - width="150"> + width="160"> + width="76"> + + + + + + + + "" + + + top_pad="1"> @@ -115,9 +115,8 @@ + top_pad="1"> @@ -131,12 +130,30 @@ Rear View + + + + + + TPP View + + @@ -146,8 +163,8 @@ value="default" />