diff options
author | Rider Linden <rider@lindenlab.com> | 2018-07-10 15:15:47 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-07-10 15:15:47 -0700 |
commit | 294793b9a983a0c26c0e82bd432d4cc311ecb1ba (patch) | |
tree | d0b2b384aef6589f1d375c4746a4b1a5b8547723 /indra/newview/llenvironment.cpp | |
parent | e7ed4b4584ca39194bd3202d3d74defd0f0421d0 (diff) |
MAINT-8821: Tighten up floater. Allow apply from gear menu.
Diffstat (limited to 'indra/newview/llenvironment.cpp')
-rw-r--r-- | indra/newview/llenvironment.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index ee5eec59a3..289d0c5388 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -366,9 +366,9 @@ bool LLEnvironment::canAgentUpdateParcelEnvironment(bool useselected) const { if (!LLEnvironment::instance().isExtendedEnvironmentEnabled()) return false; - // *TODO* - //LLParcel* parcel = (useselected) ? LLViewerParcelMgr::instance().getParcelSelection() : LLViewerParcelMgr::instance().getAgentParcel(); - LLParcel* parcel = LLViewerParcelMgr::instance().getAgentParcel(); + + LLParcel *parcel(LLViewerParcelMgr::instance().getAgentOrSelectedParcel()); + if (parcel) { return parcel->allowTerraformBy(gAgent.getID()); |