diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-01-03 08:47:03 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-01-03 08:47:03 -0800 |
| commit | cccb3a541c655c15c7578bb50dd762b68ccbfcac (patch) | |
| tree | 724f8a16f9edbaaf461ca034a0ba413384d7c7e0 /indra/newview/llfloaterland.cpp | |
| parent | 744e22e3645e205fa3f37ff3532bca607057887f (diff) | |
| parent | d607d81dba25dfe7dd1ecdf123af656ca939924f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index b20911edc5..380302b51e 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -3265,9 +3265,10 @@ BOOL LLPanelLandEnvironment::postBuild() if (!LLPanelEnvironmentInfo::postBuild()) return FALSE; - getChild<LLUICtrl>(RDO_USEDEFAULT)->setLabelArg("[USEDEFAULT]", getString(STR_LABEL_USEREGION)); + getChild<LLUICtrl>(BTN_USEDEFAULT)->setLabelArg("[USEDEFAULT]", getString(STR_LABEL_USEREGION)); getChild<LLUICtrl>(CHK_ALLOWOVERRIDE)->setVisible(FALSE); - getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setVisible(FALSE); + getChild<LLUICtrl>(PNL_ENVIRONMENT_ALTITUDES)->setVisible(TRUE); + return TRUE; } @@ -3375,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() |