diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-02 15:13:47 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-02 15:13:47 -0800 |
| commit | 5fe626afabd2857980e8011ceb6081f9e9f108c7 (patch) | |
| tree | 1d441e34455c6b17abe828fa15e4dba83c90a13f /indra/newview/llfloaterland.cpp | |
| parent | fb093ce412697a281756dcbbe5451d681f113aa7 (diff) | |
SL-10279: Most functionality now present. Still needs some cleanup on the bump code.
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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() |