diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-27 10:13:42 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-27 10:13:42 -0700 |
| commit | 337beb56f962c4574b500af20538d37d099c8cf3 (patch) | |
| tree | 912921c46c9605878fa57e9acafa165dc48c19cf /indra | |
| parent | b328c7384e46425e43aadb817bd794065ae1830c (diff) | |
Flipped the wrong return value. Fixed the conditional.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<LLParcelSelection>& parcelp); - virtual bool isRegion() const override { return true; } + virtual bool isRegion() const override { return false; } virtual BOOL postBuild() override; virtual void refresh() override; diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 20aaf258f8..6e2f3450fb 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -603,7 +603,7 @@ void LLPanelEnvironmentInfo::onBtnEdit() LLFloaterEditExtDayCycle *dayeditor = getEditFloater(); - LLSD params(LLSDMap(LLFloaterEditExtDayCycle::KEY_EDIT_CONTEXT, isRegion() ? LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION : LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION) + LLSD params(LLSDMap(LLFloaterEditExtDayCycle::KEY_EDIT_CONTEXT, isRegion() ? LLFloaterEditExtDayCycle::VALUE_CONTEXT_REGION : LLFloaterEditExtDayCycle::VALUE_CONTEXT_PARCEL) (LLFloaterEditExtDayCycle::KEY_DAY_LENGTH, mCurrentEnvironment ? (S32)(mCurrentEnvironment->mDayLength.value()) : FOURHOURS) (LLFloaterEditExtDayCycle::KEY_CANMOD, LLSD::Boolean(true))); |