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/llfloaterland.cpp | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 88b3fb7b96..fc4ab0a7a7 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -78,6 +78,7 @@ #include "lltrans.h" #include "llpanelexperiencelisteditor.h" #include "llpanelexperiencepicker.h" +#include "llpanelenvironment.h" #include "llexperiencecache.h" #include "llgroupactions.h" @@ -138,6 +139,32 @@ protected: LLPanelExperienceListEditor* mBlocked; }; +#if 0 +class LLPanelLandEnvironment + : public LLPanel +{ +public: + LLPanelLandEnvironment(LLSafeHandle& parcelp); + // TODO: LAPRAS +#if 0 + virtual BOOL postBuild(); + void refresh(); + + void experienceAdded(const LLUUID& id, U32 xp_type, U32 access_type); + void experienceRemoved(const LLUUID& id, U32 access_type); +protected: + LLPanelExperienceListEditor* setupList(const char* control_name, U32 xp_type, U32 access_type); + void refreshPanel(LLPanelExperienceListEditor* panel, U32 xp_type); + + LLSafeHandle& mParcel; + + + LLPanelExperienceListEditor* mAllowed; + LLPanelExperienceListEditor* mBlocked; +#endif +}; +#endif + // inserts maturity info(icon and text) into target textbox // names_floater - pointer to floater which contains strings with maturity icons filenames // str_to_parse is string in format "txt1[MATURITY]txt2" where maturity icon and text will be inserted instead of [MATURITY] @@ -277,6 +304,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed) mFactoryMap["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this); mFactoryMap["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this); mFactoryMap["land_experiences_panel"] = LLCallbackMap(createPanelLandExperiences, this); + mFactoryMap["land_environment_panel"] = LLCallbackMap(createPanelLandEnvironment, this); sObserver = new LLParcelSelectionObserver(); LLViewerParcelMgr::getInstance()->addObserver( sObserver ); @@ -386,6 +414,14 @@ void* LLFloaterLand::createPanelLandExperiences(void* data) return self->mPanelExperiences; } +//static +void* LLFloaterLand::createPanelLandEnvironment(void* data) +{ + LLFloaterLand* self = (LLFloaterLand*)data; + self->mPanelEnvironment = new LLPanelEnvironmentInfo(/*self->mParcel*/); + return self->mPanelEnvironment; +} + //--------------------------------------------------------------------------- // LLPanelLandGeneral -- cgit v1.2.3 From 1b8c2b5ebbe0d42f147730bc9b6528fa8c6796ce Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 23 Jan 2018 08:54:34 -0800 Subject: MAINT-8052: Initial support for new EEP cap --- indra/newview/llfloaterland.cpp | 80 +++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 14 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index fc4ab0a7a7..5d6e8885de 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -139,31 +139,21 @@ protected: LLPanelExperienceListEditor* mBlocked; }; -#if 0 + class LLPanelLandEnvironment - : public LLPanel + : public LLPanelEnvironmentInfo { public: LLPanelLandEnvironment(LLSafeHandle& parcelp); - // TODO: LAPRAS -#if 0 + virtual BOOL postBuild(); void refresh(); - void experienceAdded(const LLUUID& id, U32 xp_type, U32 access_type); - void experienceRemoved(const LLUUID& id, U32 access_type); protected: - LLPanelExperienceListEditor* setupList(const char* control_name, U32 xp_type, U32 access_type); - void refreshPanel(LLPanelExperienceListEditor* panel, U32 xp_type); LLSafeHandle& mParcel; - - LLPanelExperienceListEditor* mAllowed; - LLPanelExperienceListEditor* mBlocked; -#endif }; -#endif // inserts maturity info(icon and text) into target textbox // names_floater - pointer to floater which contains strings with maturity icons filenames @@ -346,6 +336,7 @@ void LLFloaterLand::refresh() mPanelAccess->refresh(); mPanelCovenant->refresh(); mPanelExperiences->refresh(); + mPanelEnvironment->refresh(); } @@ -418,7 +409,7 @@ void* LLFloaterLand::createPanelLandExperiences(void* data) void* LLFloaterLand::createPanelLandEnvironment(void* data) { LLFloaterLand* self = (LLFloaterLand*)data; - self->mPanelEnvironment = new LLPanelEnvironmentInfo(/*self->mParcel*/); + self->mPanelEnvironment = new LLPanelLandEnvironment(self->mParcel); return self->mPanelEnvironment; } @@ -3247,3 +3238,64 @@ void LLPanelLandExperiences::refresh() refreshPanel(mAllowed, EXPERIENCE_KEY_TYPE_ALLOWED); refreshPanel(mBlocked, EXPERIENCE_KEY_TYPE_BLOCKED); } + +//========================================================================= + +LLPanelLandEnvironment::LLPanelLandEnvironment(LLSafeHandle& parcelp): + LLPanelEnvironmentInfo(), + mParcel(parcelp) +{ +} + +BOOL LLPanelLandEnvironment::postBuild() +{ + if (!LLPanelEnvironmentInfo::postBuild()) + return FALSE; + + mAllowOverRide->setVisible(FALSE); + return TRUE; +} + +void LLPanelLandEnvironment::refresh() +{ + LLParcel* parcel = mParcel->getParcel(); + if (!parcel) + { + mRegionSettingsRadioGroup->setEnabled(FALSE); + mDayLengthSlider->setEnabled(FALSE); + mDayOffsetSlider->setEnabled(FALSE); + mAllowOverRide->setEnabled(FALSE); + + return; + } + + //BOOL owner_or_god = gAgent.isGodlike() || (parcel owner or group) + BOOL owner_or_god = true; + //BOOL owner_or_god_or_manager = owner_or_god || (region && region->isEstateManager()); + + F64Hours daylength; + F64Hours dayoffset; + + daylength = parcel->getDayLength(); + dayoffset = parcel->getDayOffset(); + + if (dayoffset.value() > 12.0) + dayoffset = dayoffset - F32Hours(24.0f); + + mDayLengthSlider->setValue(daylength.value()); + mDayOffsetSlider->setValue(dayoffset.value()); + + mRegionSettingsRadioGroup->setSelectedIndex(parcel->getUsesDefaultDayCycle() ? 0 : 1); + + setControlsEnabled(owner_or_god); + + if (!parcel->getUsesDefaultDayCycle()) + mEditingDayCycle = parcel->getParcelDayCycle()->buildClone(); + else + { + LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); + if (regionp) + mEditingDayCycle = regionp->getRegionDayCycle()->buildClone(); + } + +} -- cgit v1.2.3 From 2d41de9007ce485e2c7e96c487d609cfe1690c29 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 24 Jan 2018 13:36:59 -0800 Subject: MAINT-8052: Parcel environments. Set, clear and get. --- indra/newview/llfloaterland.cpp | 45 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 5d6e8885de..18bf4a47b3 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -82,6 +82,7 @@ #include "llexperiencecache.h" #include "llgroupactions.h" +#include "llenvironment.h" const F64 COVENANT_REFRESH_TIME_SEC = 60.0f; @@ -144,17 +145,21 @@ class LLPanelLandEnvironment : public LLPanelEnvironmentInfo { public: - LLPanelLandEnvironment(LLSafeHandle& parcelp); + LLPanelLandEnvironment(LLSafeHandle& parcelp); - virtual BOOL postBuild(); - void refresh(); + virtual BOOL postBuild(); + virtual void refresh(); protected: + virtual void doApply(); + + LLSafeHandle& mParcel; }; + // inserts maturity info(icon and text) into target textbox // names_floater - pointer to floater which contains strings with maturity icons filenames // str_to_parse is string in format "txt1[MATURITY]txt2" where maturity icon and text will be inserted instead of [MATURITY] @@ -3258,6 +3263,8 @@ BOOL LLPanelLandEnvironment::postBuild() void LLPanelLandEnvironment::refresh() { + /*TODO: if legacy don't do any of this.*/ + LLParcel* parcel = mParcel->getParcel(); if (!parcel) { @@ -3299,3 +3306,35 @@ void LLPanelLandEnvironment::refresh() } } + +void LLPanelLandEnvironment::doApply() +{ + LLParcel* parcel = mParcel->getParcel(); + if (!parcel) + { + LL_WARNS("PARCEL") << "Could not get parcel." << LL_ENDL; + } + S32 parcel_id = parcel->getLocalID(); + + if (mRegionSettingsRadioGroup->getSelectedIndex() == 0) + { + LLEnvironment::instance().resetParcel(parcel_id); + } + else + { + S64Seconds daylength; + F32Hours dayoffset_h; + + daylength = F32Hours(mDayLengthSlider->getValueF32()); + dayoffset_h = F32Hours(mDayOffsetSlider->getValueF32()); + + if (dayoffset_h.value() < 0) + { + dayoffset_h = F32Hours(24.0f) + dayoffset_h; + } + + S64Seconds dayoffset_s = dayoffset_h; + + LLEnvironment::instance().updateParcel(parcel_id, mEditingDayCycle, daylength.value(), dayoffset_s.value()); + } +} -- cgit v1.2.3 From 0bf50e2f8cfa5f3ccd6165ce935cf0fd9c174ced Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 30 Jan 2018 16:42:34 -0800 Subject: Cleanup on daycyle selection and stack. Move blenders into environment. (Transition bronken, instant only. Shaddows moved based on region, not parcel) --- indra/newview/llfloaterland.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 18bf4a47b3..39dada1984 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3283,8 +3283,19 @@ void LLPanelLandEnvironment::refresh() F64Hours daylength; F64Hours dayoffset; - daylength = parcel->getDayLength(); - dayoffset = parcel->getDayOffset(); + LLEnvironment::EnvSelection_t env = LLEnvironment::ENV_PARCEL; + + if (!LLEnvironment::instance().hasEnvironment(env)) + env = LLEnvironment::ENV_REGION; + + daylength = LLEnvironment::instance().getEnvironmentDayLength(env); + dayoffset = LLEnvironment::instance().getEnvironmentDayOffset(env); + + LLSettingsDay::ptr_t pday = LLEnvironment::instance().getEnvironmentDay(env); + + mEditingDayCycle = pday->buildClone(); + + LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_EDIT, mEditingDayCycle, daylength, dayoffset); if (dayoffset.value() > 12.0) dayoffset = dayoffset - F32Hours(24.0f); @@ -3292,19 +3303,11 @@ void LLPanelLandEnvironment::refresh() mDayLengthSlider->setValue(daylength.value()); mDayOffsetSlider->setValue(dayoffset.value()); - mRegionSettingsRadioGroup->setSelectedIndex(parcel->getUsesDefaultDayCycle() ? 0 : 1); + //mRegionSettingsRadioGroup->setSelectedIndex(parcel->getUsesDefaultDayCycle() ? 0 : 1); + mRegionSettingsRadioGroup->setSelectedIndex(1); setControlsEnabled(owner_or_god); - if (!parcel->getUsesDefaultDayCycle()) - mEditingDayCycle = parcel->getParcelDayCycle()->buildClone(); - else - { - LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); - if (regionp) - mEditingDayCycle = regionp->getRegionDayCycle()->buildClone(); - } - } void LLPanelLandEnvironment::doApply() -- cgit v1.2.3 From 8cfdc07e790a557e881fadaa1b6258e5b16751f4 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 1 Jun 2018 23:32:30 +0100 Subject: Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types. --- indra/newview/llfloaterland.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 39dada1984..ac47253444 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3325,7 +3325,7 @@ void LLPanelLandEnvironment::doApply() } else { - S64Seconds daylength; + LLSettingsDay::Seconds daylength; F32Hours dayoffset_h; daylength = F32Hours(mDayLengthSlider->getValueF32()); @@ -3336,7 +3336,7 @@ void LLPanelLandEnvironment::doApply() dayoffset_h = F32Hours(24.0f) + dayoffset_h; } - S64Seconds dayoffset_s = dayoffset_h; + LLSettingsDay::Seconds dayoffset_s = dayoffset_h; LLEnvironment::instance().updateParcel(parcel_id, mEditingDayCycle, daylength.value(), dayoffset_s.value()); } -- cgit v1.2.3 From d5c465b4ab263e568761f6197534f7ddcda8a5ee Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 29 Jun 2018 20:15:10 +0100 Subject: MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which expects it not to match the projection mat works again Fix misspellinging in missing settings asset notification string Fix moon quat conversion to get proper directional rotation Add early out so attempting to set parcel env settings doesn't crash --- indra/newview/llfloaterland.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index fcf836f4a0..dacdb197e7 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3297,6 +3297,7 @@ void LLPanelLandEnvironment::doApply() if (!parcel) { LL_WARNS("PARCEL") << "Could not get parcel." << LL_ENDL; + return; } S32 parcel_id = parcel->getLocalID(); -- cgit v1.2.3 From eadf0b910174274e7c83fe37e417f576a7350edb Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 15 Aug 2018 13:35:53 -0700 Subject: MAINT-8990, MAINT-9002: First pass rework on environment panels, region/parcel --- indra/newview/llfloaterland.cpp | 133 ++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 68 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 995b5aaffc..5fcd3df7a8 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -145,14 +145,19 @@ class LLPanelLandEnvironment : public LLPanelEnvironmentInfo { public: - LLPanelLandEnvironment(LLSafeHandle& parcelp); + LLPanelLandEnvironment(LLSafeHandle& parcelp); - virtual BOOL postBuild(); - virtual void refresh(); + virtual bool isRegion() const override { return false; } + virtual BOOL postBuild() override; + virtual void refresh() override; + + virtual LLParcel * getParcel() override; + + virtual bool canEdit(); protected: - virtual void doApply(); + virtual void doApply(); LLSafeHandle& mParcel; @@ -3257,88 +3262,80 @@ BOOL LLPanelLandEnvironment::postBuild() if (!LLPanelEnvironmentInfo::postBuild()) return FALSE; - mAllowOverRide->setVisible(FALSE); + getChild(RDO_USEDEFAULT)->setLabelArg("[USEDEFAULT]", getString(STR_LABEL_USEREGION)); + getChild(CHK_ALLOWOVERRIDE)->setVisible(FALSE); return TRUE; } void LLPanelLandEnvironment::refresh() { - /*TODO: if legacy don't do any of this.*/ + if (gDisconnected) + return; - LLParcel* parcel = mParcel->getParcel(); + LLParcel *parcel = getParcel(); if (!parcel) { - mRegionSettingsRadioGroup->setEnabled(FALSE); - mDayLengthSlider->setEnabled(FALSE); - mDayOffsetSlider->setEnabled(FALSE); - mAllowOverRide->setEnabled(FALSE); - + LL_INFOS("ENVPANEL") << "No parcel selected." << LL_ENDL; + mCurrentEnvironment.reset(); + mCurrentParcelId = INVALID_PARCEL_ID; + setControlsEnabled(false); return; } - //BOOL owner_or_god = gAgent.isGodlike() || (parcel owner or group) - BOOL owner_or_god = true; - //BOOL owner_or_god_or_manager = owner_or_god || (region && region->isEstateManager()); - - F64Hours daylength; - F64Hours dayoffset; - - LLEnvironment::EnvSelection_t env = LLEnvironment::ENV_PARCEL; - - if (!LLEnvironment::instance().hasEnvironment(env)) - env = LLEnvironment::ENV_REGION; - - daylength = LLEnvironment::instance().getEnvironmentDayLength(env); - dayoffset = LLEnvironment::instance().getEnvironmentDayOffset(env); - - LLSettingsDay::ptr_t pday = LLEnvironment::instance().getEnvironmentDay(env); - - mEditingDayCycle = pday->buildClone(); - - LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_EDIT, mEditingDayCycle, daylength, dayoffset); + if ((!mCurrentEnvironment) || (mCurrentEnvironment->mParcelId != parcel->getLocalID())) + { + mCurrentParcelId = parcel->getLocalID(); + refreshFromSource(); + return; + } - if (dayoffset.value() > 12.0) - dayoffset = dayoffset - F32Hours(24.0f); + LLPanelEnvironmentInfo::refresh(); - mDayLengthSlider->setValue(daylength.value()); - mDayOffsetSlider->setValue(dayoffset.value()); +} - //mRegionSettingsRadioGroup->setSelectedIndex(parcel->getUsesDefaultDayCycle() ? 0 : 1); - mRegionSettingsRadioGroup->setSelectedIndex(1); +LLParcel *LLPanelLandEnvironment::getParcel() +{ + return mParcel->getParcel(); +} - setControlsEnabled(owner_or_god); +bool LLPanelLandEnvironment::canEdit() +{ + LLParcel *parcel = getParcel(); + if (!parcel) + return false; + return LLEnvironment::instance().canAgentUpdateParcelEnvironment(parcel); } void LLPanelLandEnvironment::doApply() { - LLParcel* parcel = mParcel->getParcel(); - if (!parcel) - { - LL_WARNS("PARCEL") << "Could not get parcel." << LL_ENDL; - return; - } - S32 parcel_id = parcel->getLocalID(); - - if (mRegionSettingsRadioGroup->getSelectedIndex() == 0) - { - LLEnvironment::instance().resetParcel(parcel_id); - } - else - { - LLSettingsDay::Seconds daylength; - F32Hours dayoffset_h; - - daylength = F32Hours(mDayLengthSlider->getValueF32()); - dayoffset_h = F32Hours(mDayOffsetSlider->getValueF32()); - - if (dayoffset_h.value() < 0) - { - dayoffset_h = F32Hours(24.0f) + dayoffset_h; - } - - LLSettingsDay::Seconds dayoffset_s = dayoffset_h; - - LLEnvironment::instance().updateParcel(parcel_id, mEditingDayCycle, daylength.value(), dayoffset_s.value()); - } +// LLParcel* parcel = mParcel->getParcel(); +// if (!parcel) +// { +// LL_WARNS("PARCEL") << "Could not get parcel." << LL_ENDL; +// return; +// } +// S32 parcel_id = parcel->getLocalID(); +// +// if (mRegionSettingsRadioGroup->getSelectedIndex() == 0) +// { +// LLEnvironment::instance().resetParcel(parcel_id); +// } +// else +// { +// LLSettingsDay::Seconds daylength; +// F32Hours dayoffset_h; +// +// daylength = F32Hours(mDayLengthSlider->getValueF32()); +// dayoffset_h = F32Hours(mDayOffsetSlider->getValueF32()); +// +// if (dayoffset_h.value() < 0) +// { +// dayoffset_h = F32Hours(24.0f) + dayoffset_h; +// } +// +// LLSettingsDay::Seconds dayoffset_s = dayoffset_h; +// +// LLEnvironment::instance().updateParcel(parcel_id, mEditingDayCycle, daylength.value(), dayoffset_s.value()); +// } } -- cgit v1.2.3 From 68158f0340729d9f7e5a4b3e64bfc154a105ab6c Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 16 Aug 2018 09:43:54 -0700 Subject: Pass call backs into parcel and region change methods. --- indra/newview/llfloaterland.cpp | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 5fcd3df7a8..57d34c5c5a 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -157,9 +157,6 @@ public: virtual bool canEdit(); protected: - virtual void doApply(); - - LLSafeHandle& mParcel; }; @@ -3306,36 +3303,3 @@ bool LLPanelLandEnvironment::canEdit() return false; return LLEnvironment::instance().canAgentUpdateParcelEnvironment(parcel); } - -void LLPanelLandEnvironment::doApply() -{ -// LLParcel* parcel = mParcel->getParcel(); -// if (!parcel) -// { -// LL_WARNS("PARCEL") << "Could not get parcel." << LL_ENDL; -// return; -// } -// S32 parcel_id = parcel->getLocalID(); -// -// if (mRegionSettingsRadioGroup->getSelectedIndex() == 0) -// { -// LLEnvironment::instance().resetParcel(parcel_id); -// } -// else -// { -// LLSettingsDay::Seconds daylength; -// F32Hours dayoffset_h; -// -// daylength = F32Hours(mDayLengthSlider->getValueF32()); -// dayoffset_h = F32Hours(mDayOffsetSlider->getValueF32()); -// -// if (dayoffset_h.value() < 0) -// { -// dayoffset_h = F32Hours(24.0f) + dayoffset_h; -// } -// -// LLSettingsDay::Seconds dayoffset_s = dayoffset_h; -// -// LLEnvironment::instance().updateParcel(parcel_id, mEditingDayCycle, daylength.value(), dayoffset_s.value()); -// } -} -- cgit v1.2.3 From 076836f2456124ddd26f482934cd5c501f061abf Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 17 Aug 2018 13:26:03 -0700 Subject: Left off an override. --- indra/newview/llfloaterland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 57d34c5c5a..91f755e71b 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -154,7 +154,7 @@ public: virtual LLParcel * getParcel() override; - virtual bool canEdit(); + virtual bool canEdit() override; protected: LLSafeHandle& mParcel; -- cgit v1.2.3 From 477c66c890d5d87318705415315aaf9464bec2ff Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 21 Aug 2018 11:37:59 -0700 Subject: Lest couple nullptr checks and disable the controls on legacy regions. --- indra/newview/llfloaterland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 91f755e71b..3e50700377 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3279,7 +3279,7 @@ void LLPanelLandEnvironment::refresh() return; } - if ((!mCurrentEnvironment) || (mCurrentEnvironment->mParcelId != parcel->getLocalID())) + if (LLEnvironment::instance().isExtendedEnvironmentEnabled() && ((!mCurrentEnvironment) || (mCurrentEnvironment->mParcelId != parcel->getLocalID()))) { mCurrentParcelId = parcel->getLocalID(); refreshFromSource(); -- cgit v1.2.3 From 43c8f5959f8afaf2f67fbbf49e78965802859b55 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 10 Sep 2018 16:44:56 +0300 Subject: MAINT-9099 Adjustable region altitudes. --- indra/newview/llfloaterland.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 3e50700377..a2886d5010 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3261,6 +3261,7 @@ BOOL LLPanelLandEnvironment::postBuild() getChild(RDO_USEDEFAULT)->setLabelArg("[USEDEFAULT]", getString(STR_LABEL_USEREGION)); getChild(CHK_ALLOWOVERRIDE)->setVisible(FALSE); + getChild(PNL_ENVIRONMENT_ALTITUDES)->setVisible(FALSE); return TRUE; } -- cgit v1.2.3 From 7c6ac0740dac946275ef3f904614688f4b73f850 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 14 Sep 2018 09:52:28 -0700 Subject: SL-1556: Correctly identify when the selected parcel is in another region and display a message about cross region environments. --- indra/newview/llfloaterland.cpp | 72 +++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 9 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index a2886d5010..38ced18edf 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -155,10 +155,15 @@ public: virtual LLParcel * getParcel() override; virtual bool canEdit() override; + virtual S32 getParcelId() override; + protected: + virtual void refreshFromSource() override; - LLSafeHandle& mParcel; + bool isSameRegion(); + LLSafeHandle & mParcel; + S32 mLastParcelId; }; @@ -3248,9 +3253,10 @@ void LLPanelLandExperiences::refresh() //========================================================================= -LLPanelLandEnvironment::LLPanelLandEnvironment(LLSafeHandle& parcelp): +LLPanelLandEnvironment::LLPanelLandEnvironment(LLParcelSelectionHandle& parcel) : LLPanelEnvironmentInfo(), - mParcel(parcelp) + mParcel(parcel), + mLastParcelId(INVALID_PARCEL_ID) { } @@ -3270,25 +3276,64 @@ void LLPanelLandEnvironment::refresh() if (gDisconnected) return; - LLParcel *parcel = getParcel(); - if (!parcel) + if (!isSameRegion()) { - LL_INFOS("ENVPANEL") << "No parcel selected." << LL_ENDL; + setCrossRegion(true); mCurrentEnvironment.reset(); - mCurrentParcelId = INVALID_PARCEL_ID; + mLastParcelId = INVALID_PARCEL_ID; setControlsEnabled(false); return; } - if (LLEnvironment::instance().isExtendedEnvironmentEnabled() && ((!mCurrentEnvironment) || (mCurrentEnvironment->mParcelId != parcel->getLocalID()))) + if (mLastParcelId != getParcelId()) + { + mCurrentEnvironment.reset(); + } + + if (!mCurrentEnvironment) { - mCurrentParcelId = parcel->getLocalID(); refreshFromSource(); return; } LLPanelEnvironmentInfo::refresh(); + getChild(PNL_ENVIRONMENT_ALTITUDES)->setVisible(FALSE); +} + +void LLPanelLandEnvironment::refreshFromSource() +{ + LLParcel *parcel = getParcel(); + + if (!parcel) + { + setNoSelection(true); + setControlsEnabled(false); + return; + } + setNoSelection(false); + if (isSameRegion()) + { + setCrossRegion(false); + + LLEnvironment::instance().requestParcel(parcel->getLocalID(), + [this](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) { mLastParcelId = parcel_id; onEnvironmentReceived(parcel_id, envifo); }); + } + else + { + setCrossRegion(true); + mCurrentEnvironment.reset(); + mLastParcelId = INVALID_PARCEL_ID; + setControlsEnabled(false); + } +} + + +bool LLPanelLandEnvironment::isSameRegion() +{ + LLViewerRegion* regionp = LLViewerParcelMgr::instance().getSelectionRegion(); + + return (!regionp || (regionp->getRegionID() == gAgent.getRegion()->getRegionID())); } LLParcel *LLPanelLandEnvironment::getParcel() @@ -3304,3 +3349,12 @@ bool LLPanelLandEnvironment::canEdit() return false; return LLEnvironment::instance().canAgentUpdateParcelEnvironment(parcel); } + +S32 LLPanelLandEnvironment::getParcelId() +{ + LLParcel *parcel = getParcel(); + if (!parcel) + return INVALID_PARCEL_ID; + + return parcel->getLocalID(); +} -- cgit v1.2.3 From 17fb7d0bf4cc4db1c3f30dbbbdee7610d168336c Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 17 Sep 2018 14:21:38 -0700 Subject: SL-9667, SL-9669: Do not attempt to request environment for non-eep parcels, use handle to panel passed to static for callbacks. --- indra/newview/llfloaterland.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 38ced18edf..453c9f1138 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3304,6 +3304,14 @@ void LLPanelLandEnvironment::refreshFromSource() { LLParcel *parcel = getParcel(); + if (!LLEnvironment::instance().isExtendedEnvironmentEnabled()) + { + setNoEnvironmentSupport(true); + setControlsEnabled(false); + return; + } + setNoEnvironmentSupport(false); + if (!parcel) { setNoSelection(true); @@ -3316,8 +3324,16 @@ void LLPanelLandEnvironment::refreshFromSource() { setCrossRegion(false); + LLHandle that_h = getHandle(); + LLEnvironment::instance().requestParcel(parcel->getLocalID(), - [this](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) { mLastParcelId = parcel_id; onEnvironmentReceived(parcel_id, envifo); }); + [that_h](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) + { + LLPanelLandEnvironment *that = (LLPanelLandEnvironment*)that_h.get(); + if (!that) return; + that->mLastParcelId = parcel_id; + that->onEnvironmentReceived(parcel_id, envifo); + }); } else { -- cgit v1.2.3 From ff8f5f52a49d7984909a1d2dcb89ad81a3cb7588 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 19 Sep 2018 17:48:41 +0300 Subject: SL-9679 EEP - disable panel elements until data update, null cycle crash fix --- indra/newview/llfloaterland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 453c9f1138..3d3f5e8cfa 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3340,8 +3340,8 @@ void LLPanelLandEnvironment::refreshFromSource() setCrossRegion(true); mCurrentEnvironment.reset(); mLastParcelId = INVALID_PARCEL_ID; - setControlsEnabled(false); } + setControlsEnabled(false); } -- cgit v1.2.3 From 18dd6f076e3d3936e6b5a426d8c5476fac4c4e58 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 25 Sep 2018 20:27:59 +0300 Subject: SL-1961 EEP Altitude labels auto-adjustment --- indra/newview/llfloaterland.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 3d3f5e8cfa..1147f54853 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3297,7 +3297,6 @@ void LLPanelLandEnvironment::refresh() } LLPanelEnvironmentInfo::refresh(); - getChild(PNL_ENVIRONMENT_ALTITUDES)->setVisible(FALSE); } void LLPanelLandEnvironment::refreshFromSource() -- cgit v1.2.3 From b328c7384e46425e43aadb817bd794065ae1830c Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 26 Sep 2018 16:54:01 -0700 Subject: SL-9679: Record the asset id that the editor is expecting. If none set to null. If asset id recieved does not match expected throw it away. --- indra/newview/llfloaterland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 1147f54853..f90b188fde 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -147,7 +147,7 @@ class LLPanelLandEnvironment public: LLPanelLandEnvironment(LLSafeHandle& parcelp); - virtual bool isRegion() const override { return false; } + virtual bool isRegion() const override { return true; } virtual BOOL postBuild() override; virtual void refresh() override; -- cgit v1.2.3 From 337beb56f962c4574b500af20538d37d099c8cf3 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 27 Sep 2018 10:13:42 -0700 Subject: Flipped the wrong return value. Fixed the conditional. --- indra/newview/llfloaterland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index f90b188fde..1147f54853 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -147,7 +147,7 @@ class LLPanelLandEnvironment public: LLPanelLandEnvironment(LLSafeHandle& parcelp); - virtual bool isRegion() const override { return true; } + virtual bool isRegion() const override { return false; } virtual BOOL postBuild() override; virtual void refresh() override; -- cgit v1.2.3 From 6505a80b4a0dc5b41ae25806efbf1e83e432a519 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 1 Nov 2018 17:45:58 +0200 Subject: SL-9905 FIXED [EEP] Teleporting from EEP Region with parcel environment does not clear on non-eep region. --- indra/newview/llfloaterland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 1147f54853..0ff660fcad 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -255,7 +255,7 @@ LLPanelLandCovenant* LLFloaterLand::getCurrentPanelLandCovenant() // static void LLFloaterLand::refreshAll() { - LLFloaterLand* land_instance = LLFloaterReg::getTypedInstance("about_land"); + LLFloaterLand* land_instance = LLFloaterReg::findTypedInstance("about_land"); if(land_instance) { land_instance->refresh(); -- cgit v1.2.3 From 77b278b7f5615a6ba93b47c2a0d8a2338dc27dc2 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 12 Nov 2018 16:41:40 +0200 Subject: SL-9620 Viewer crashes after clicking "Commit" button while editing Day Cycle preset --- indra/newview/llfloaterland.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 0ff660fcad..25cbf2f576 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3325,6 +3325,7 @@ void LLPanelLandEnvironment::refreshFromSource() LLHandle that_h = getHandle(); + mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION; LLEnvironment::instance().requestParcel(parcel->getLocalID(), [that_h](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) { -- cgit v1.2.3 From 76071d4fe8f2b88e33d0393fe00dc2ce88f71935 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 5 Dec 2018 22:13:49 +0200 Subject: SL-10091 EEP Filter out dupplicate refreshes and callbacks --- indra/newview/llfloaterland.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 25cbf2f576..b20911edc5 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3281,16 +3281,18 @@ void LLPanelLandEnvironment::refresh() setCrossRegion(true); mCurrentEnvironment.reset(); mLastParcelId = INVALID_PARCEL_ID; + mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION; setControlsEnabled(false); return; } if (mLastParcelId != getParcelId()) { + mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION; mCurrentEnvironment.reset(); } - if (!mCurrentEnvironment) + if (!mCurrentEnvironment && mCurEnvVersion <= INVALID_PARCEL_ENVIRONMENT_VERSION) { refreshFromSource(); return; @@ -3307,6 +3309,7 @@ void LLPanelLandEnvironment::refreshFromSource() { setNoEnvironmentSupport(true); setControlsEnabled(false); + mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION; return; } setNoEnvironmentSupport(false); @@ -3315,17 +3318,25 @@ void LLPanelLandEnvironment::refreshFromSource() { setNoSelection(true); setControlsEnabled(false); + mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION; return; } setNoSelection(false); if (isSameRegion()) { + LL_DEBUGS("ENVIRONMENT") << "Requesting environment for parcel " << parcel->getLocalID() << ", known version " << mCurEnvVersion << LL_ENDL; setCrossRegion(false); LLHandle that_h = getHandle(); - mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION; + if (mCurEnvVersion < UNSET_PARCEL_ENVIRONMENT_VERSION) + { + // to mark as requesting + mCurEnvVersion = parcel->getParcelEnvironmentVersion(); + } + mLastParcelId = parcel->getLocalID(); + LLEnvironment::instance().requestParcel(parcel->getLocalID(), [that_h](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) { @@ -3340,6 +3351,7 @@ void LLPanelLandEnvironment::refreshFromSource() setCrossRegion(true); mCurrentEnvironment.reset(); mLastParcelId = INVALID_PARCEL_ID; + mCurEnvVersion = INVALID_PARCEL_ENVIRONMENT_VERSION; } setControlsEnabled(false); } -- cgit v1.2.3 From 8227a0b270f6e7cc521adeb7b97ad2d5fb646973 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 21 Dec 2018 15:30:57 -0800 Subject: SL-10279: Rework the environment pannel. Still in progress. --- indra/newview/llfloaterland.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index b20911edc5..21a062184c 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3265,9 +3265,10 @@ BOOL LLPanelLandEnvironment::postBuild() if (!LLPanelEnvironmentInfo::postBuild()) return FALSE; - getChild(RDO_USEDEFAULT)->setLabelArg("[USEDEFAULT]", getString(STR_LABEL_USEREGION)); + getChild(BTN_USEDEFAULT)->setLabelArg("[USEDEFAULT]", getString(STR_LABEL_USEREGION)); getChild(CHK_ALLOWOVERRIDE)->setVisible(FALSE); - getChild(PNL_ENVIRONMENT_ALTITUDES)->setVisible(FALSE); + getChild(PNL_ENVIRONMENT_ALTITUDES)->setVisible(TRUE); + return TRUE; } -- cgit v1.2.3 From 5fe626afabd2857980e8011ceb6081f9e9f108c7 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Wed, 2 Jan 2019 15:13:47 -0800 Subject: SL-10279: Most functionality now present. Still needs some cleanup on the bump code. --- indra/newview/llfloaterland.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 21a062184c..380302b51e 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3376,7 +3376,8 @@ bool LLPanelLandEnvironment::canEdit() LLParcel *parcel = getParcel(); if (!parcel) return false; - return LLEnvironment::instance().canAgentUpdateParcelEnvironment(parcel); + + return LLEnvironment::instance().canAgentUpdateParcelEnvironment(parcel) && mAllowOverride; } S32 LLPanelLandEnvironment::getParcelId() -- cgit v1.2.3 From 1badfb0e96959725fbe2895994607a088f4a808b Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 7 Jan 2019 10:24:55 -0800 Subject: SL-9883: Hide controls and display message if parcel < 128m --- indra/newview/llfloaterland.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 380302b51e..eeb1c17f4b 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -148,6 +148,11 @@ public: LLPanelLandEnvironment(LLSafeHandle& parcelp); virtual bool isRegion() const override { return false; } + virtual bool isLargeEnough() override + { + LLParcel *parcelp = mParcel->getParcel(); + return ((parcelp) ? (parcelp->getArea() >= MINIMUM_PARCEL_SIZE) : false); + } virtual BOOL postBuild() override; virtual void refresh() override; @@ -3376,7 +3381,7 @@ bool LLPanelLandEnvironment::canEdit() LLParcel *parcel = getParcel(); if (!parcel) return false; - + return LLEnvironment::instance().canAgentUpdateParcelEnvironment(parcel) && mAllowOverride; } -- cgit v1.2.3 From bfc4b9fcf4bb3266e06c2f954854a430cca5075f Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 2 Aug 2019 20:23:06 +0300 Subject: SL-11668 Changes caused by Arrow Keys were not commited --- indra/newview/llfloaterland.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 4a93f1b886..4f147fdb07 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3319,6 +3319,8 @@ void LLPanelLandEnvironment::refresh() if (gDisconnected) return; + commitDayLenOffsetChanges(false); // commit unsaved changes if any + if (!isSameRegion()) { setCrossRegion(true); -- cgit v1.2.3 From bcae0366a0d3a27979a693c1c3047e51663f5f22 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 19 Aug 2019 13:50:17 +0300 Subject: SL-11749 FIXED Show in search grayed out at 128m minimum --- indra/newview/llfloaterland.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 3098c6d118..d8f4360142 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2209,7 +2209,7 @@ void LLPanelLandOptions::refreshSearch() // effort to reduce search spam from small parcels. See also // the search crawler "grid-crawl.py" in secondlife.com/doc/app/search/ JC const S32 MIN_PARCEL_AREA_FOR_SEARCH = 128; - bool large_enough = parcel->getArea() > MIN_PARCEL_AREA_FOR_SEARCH; + bool large_enough = parcel->getArea() >= MIN_PARCEL_AREA_FOR_SEARCH; if (large_enough) { if (can_change) -- 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/llfloaterland.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 02c81adf2c..7b0c91da80 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3329,6 +3329,7 @@ BOOL LLPanelLandEnvironment::postBuild() getChild(BTN_USEDEFAULT)->setLabelArg("[USEDEFAULT]", getString(STR_LABEL_USEREGION)); getChild(CHK_ALLOWOVERRIDE)->setVisible(FALSE); + getChild(PNL_REGION_MSG)->setVisible(FALSE); getChild(PNL_ENVIRONMENT_ALTITUDES)->setVisible(TRUE); return TRUE; -- cgit v1.2.3