From b37eb2642f6e6e4d1e32a49c7ab31f70321cd979 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 10 Nov 2017 16:17:25 -0800 Subject: Remove delete preset dialog, Initial settings for selection level (Region/Parcel/Local) --- indra/newview/llfloaterregioninfo.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index c9d0e51640..105280bd99 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -35,7 +35,6 @@ #include "llpanel.h" #include "llextendedstatus.h" -#include "llenvmanager.h" // for LLEnvironmentSettings #include "lleventcoro.h" class LLAvatarName; @@ -463,7 +462,7 @@ private: void onRegionSettingsApplied(bool ok); /// New environment settings that are being applied to the region. - LLEnvironmentSettings mNewRegionSettings; +// LLEnvironmentSettings mNewRegionSettings; bool mEnableEditing; -- cgit v1.2.3 From b227c86b450134f17ec0624655e1e4c5cb5ba89d Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 13 Nov 2017 14:40:54 -0800 Subject: Remove the old wl environment code. --- indra/newview/llfloaterregioninfo.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 105280bd99..bbdff84bf6 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -65,11 +65,6 @@ class LLPanelExperiences; class LLPanelRegionExperiences; class LLEventTimer; -class LLEnvironmentSettings; -class LLWLParamManager; -class LLWaterParamManager; -class LLWLParamSet; -class LLWaterParamSet; class LLFloaterRegionInfo : public LLFloater { -- cgit v1.2.3 From a0c228d84240a80437b63e0a2cd1cee24e8004a0 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 16 Jan 2018 11:03:26 -0800 Subject: MAINT-8052: Report if the returned environment is the default. --- indra/newview/llfloaterregioninfo.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index bbdff84bf6..61bf33af2f 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -34,6 +34,7 @@ #include "llhost.h" #include "llpanel.h" #include "llextendedstatus.h" +#include "llpanelenvironment.h" #include "lleventcoro.h" @@ -63,6 +64,7 @@ class LLPanelEstateCovenant; class LLPanelExperienceListEditor; class LLPanelExperiences; class LLPanelRegionExperiences; +class LLPanelRegionEnvironment; class LLEventTimer; @@ -115,6 +117,7 @@ protected: LLTabContainer* mTab; typedef std::vector info_panels_t; info_panels_t mInfoPanels; + LLPanelRegionEnvironment *mEnvironmentPanel; //static S32 sRequestSerial; // serial # of last EstateOwnerRequest static LLUUID sRequestInvoice; }; @@ -409,6 +412,7 @@ protected: ///////////////////////////////////////////////////////////////////////////// +#if 0 class LLPanelEnvironmentInfo : public LLPanelRegionInfo { LOG_CLASS(LLPanelEnvironmentInfo); @@ -468,10 +472,11 @@ private: LLComboBox* mSkyPresetCombo; LLComboBox* mDayCyclePresetCombo; }; +#endif class LLPanelRegionExperiences : public LLPanelRegionInfo { - LOG_CLASS(LLPanelEnvironmentInfo); + LOG_CLASS(LLPanelRegionExperiences); public: LLPanelRegionExperiences(){} -- cgit v1.2.3 From 536aeb54a6130f3d1e20405c8f6cbd29201de26d Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 23 Jan 2018 17:34:25 -0800 Subject: MAINT-8052: One more step towards parcel environments. --- indra/newview/llfloaterregioninfo.h | 61 ------------------------------------- 1 file changed, 61 deletions(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 61bf33af2f..6d64ae1d60 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -412,67 +412,6 @@ protected: ///////////////////////////////////////////////////////////////////////////// -#if 0 -class LLPanelEnvironmentInfo : public LLPanelRegionInfo -{ - LOG_CLASS(LLPanelEnvironmentInfo); - -public: - LLPanelEnvironmentInfo(); - - // LLPanel - /*virtual*/ BOOL postBuild(); - /*virtual*/ void onOpen(const LLSD& key); - - // LLView - /*virtual*/ void onVisibilityChange(BOOL new_visibility); - - // LLPanelRegionInfo - /*virtual*/ bool refreshFromRegion(LLViewerRegion* region); - -private: - void refresh(); - void setControlsEnabled(bool enabled); - void setApplyProgress(bool started); - void setDirty(bool dirty); - - void sendRegionSunUpdate(); - void fixEstateSun(); - - void populateWaterPresetsList(); - void populateSkyPresetsList(); - void populateDayCyclesList(); - - bool getSelectedWaterParams(LLSD& water_params); - bool getSelectedSkyParams(LLSD& sky_params, std::string& preset_name); - bool getSelectedDayCycleParams(LLSD& day_cycle, LLSD& sky_map, short& scope); - - void onSwitchRegionSettings(); - void onSwitchDayCycle(); - - void onSelectWaterPreset(); - void onSelectSkyPreset(); - void onSelectDayCycle(); - - void onBtnApply(); - void onBtnCancel(); - - void onRegionSettingschange(); - void onRegionSettingsApplied(bool ok); - - /// New environment settings that are being applied to the region. -// LLEnvironmentSettings mNewRegionSettings; - - bool mEnableEditing; - - LLRadioGroup* mRegionSettingsRadioGroup; - LLRadioGroup* mDayCycleSettingsRadioGroup; - - LLComboBox* mWaterPresetCombo; - LLComboBox* mSkyPresetCombo; - LLComboBox* mDayCyclePresetCombo; -}; -#endif class LLPanelRegionExperiences : public LLPanelRegionInfo { -- cgit v1.2.3 From d4fe87cca49162c978b4eacde880431977624874 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 7 Dec 2018 16:24:47 +0200 Subject: SL-10091 Prevent info floater from re-requesting data when not open --- indra/newview/llfloaterregioninfo.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 6d64ae1d60..0566c4b2ce 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -96,6 +96,7 @@ public: // from LLPanel virtual void refresh(); + void onRegionChanged(); void requestRegionInfo(); void requestMeshRezInfo(); void enableTopButtons(); @@ -120,6 +121,8 @@ protected: LLPanelRegionEnvironment *mEnvironmentPanel; //static S32 sRequestSerial; // serial # of last EstateOwnerRequest static LLUUID sRequestInvoice; +private: + boost::signals2::connection mRegionChangedCallback; }; -- cgit v1.2.3 From 0969632b11383e83a53bce3a10379945be7ad8c2 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 4 Jan 2019 12:32:23 -0800 Subject: Move some estate requests into the LLEstateInfoModel and out of the Region floater. Fix issue where user could potentially be looking at one set of estate options and update the estate they were standing in by mistake. --- indra/newview/llfloaterregioninfo.h | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 0566c4b2ce..e4687fff0c 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -77,13 +77,9 @@ public: /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ BOOL postBuild(); - static void processEstateOwnerRequest(LLMessageSystem* msg, void**); - // get and process region info if necessary. static void processRegionInfo(LLMessageSystem* msg); - static const LLUUID& getLastInvoice() { return sRequestInvoice; } - static void nextInvoice() { sRequestInvoice.generate(); } //static S32 getSerial() { return sRequestSerial; } //static void incrementSerial() { sRequestSerial++; } @@ -119,8 +115,7 @@ protected: typedef std::vector info_panels_t; info_panels_t mInfoPanels; LLPanelRegionEnvironment *mEnvironmentPanel; - //static S32 sRequestSerial; // serial # of last EstateOwnerRequest - static LLUUID sRequestInvoice; + private: boost::signals2::connection mRegionChangedCallback; }; @@ -157,14 +152,6 @@ protected: typedef std::vector strings_t; //typedef std::vector integers_t; - void sendEstateOwnerMessage( - LLMessageSystem* msg, - const std::string& request, - const LLUUID& invoice, - const strings_t& strings); - - // member data - LLHost mHost; }; ///////////////////////////////////////////////////////////////////////////// @@ -266,12 +253,9 @@ private: }; ///////////////////////////////////////////////////////////////////////////// - class LLPanelEstateInfo : public LLPanelRegionInfo { public: - static void initDispatch(LLDispatcher& dispatch); - void onChangeFixedSun(); void onChangeUseGlobalTime(); void onChangeAccessOverride(); @@ -331,6 +315,7 @@ public: virtual void refresh(); void refreshFromEstate(); + void refreshAccessFromEstate(U32 flags); static bool isLindenEstate(); @@ -433,7 +418,7 @@ public: void sendPurchaseRequest()const; void processResponse( const LLSD& content ); private: - void refreshRegionExperiences(); + void refreshExperiencesFromEstate(); static std::string regionCapabilityQuery(LLViewerRegion* region, const std::string &cap); -- cgit v1.2.3 From 7a7f68fb3c09c187f5b6fd333d0292a3fbfbc9df Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 27 Sep 2019 16:58:54 +0300 Subject: SL-12024 [EEP] UI should indicate that the Environment tab is an estate-wide setting. --- indra/newview/llfloaterregioninfo.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 0dda13cdc5..61aa0778ef 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -96,6 +96,7 @@ public: static LLPanelRegionTerrainInfo* getPanelRegionTerrain(); static LLPanelRegionExperiences* getPanelExperiences(); static LLPanelRegionGeneralInfo* getPanelGeneral(); + static LLPanelRegionEnvironment* getPanelEnvironment(); // from LLPanel virtual void refresh(); @@ -106,6 +107,8 @@ public: void enableTopButtons(); void disableTopButtons(); + static void updateEstateName(const std::string& estate_name); + private: LLFloaterRegionInfo(const LLSD& seed); -- cgit v1.2.3 From 7ff09d05f2023ce8eb26acc46da22f8d86743de5 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 7 Oct 2019 12:41:00 +0300 Subject: SL-12024 Remove 'Estate warning' message and show just region name instead --- indra/newview/llfloaterregioninfo.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llfloaterregioninfo.h') diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 61aa0778ef..75d0c3ea5c 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -107,8 +107,6 @@ public: void enableTopButtons(); void disableTopButtons(); - static void updateEstateName(const std::string& estate_name); - private: LLFloaterRegionInfo(const LLSD& seed); -- cgit v1.2.3