From 886be2faf19343843d8b2bf7a24c91bdeb1a9294 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 2 Jul 2024 11:44:14 +0300 Subject: viewer#1857 Reset texture transforms when terrain PBR is applied ctrls aren't dynamically alocated so getChild is preferable, but since other elements use findchild and validy checks used findChild as well --- indra/newview/llfloaterregioninfo.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 5623bc20cb..60564435d7 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -273,6 +273,8 @@ public: protected: bool sendUpdate() override; + void initMaterialCtrl(LLTextureCtrl*& ctrl, const std::string& name, S32 index); + private: bool mConfirmedTextureHeights; bool mAskedTextureHeights; -- cgit v1.2.3 From 4d7f622a3c6a2fdec1c57ad4506ae49786b37dfc Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:02:03 +0300 Subject: viewer#2065 Region restart schedule floater --- indra/newview/llfloaterregioninfo.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 60564435d7..b604a28fc3 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -154,6 +154,7 @@ public: void disableButton(const std::string& btn_name); void onClickManageTelehub(); + void onClickManageRestartSchedule(); protected: void initCtrl(const std::string& name); @@ -174,6 +175,7 @@ protected: // member data LLHost mHost; + LLHandle mFloaterRestartScheduleHandle; }; ///////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3