diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-01 16:12:48 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-01 16:12:48 -0700 |
| commit | fdfb60ecb10a35efdc378ae507e1c65114a987a3 (patch) | |
| tree | 05a183987a0fb2464855df1b193b7bb035c61745 /indra/newview/llfloaterfixedenvironment.cpp | |
| parent | 6e7d794b01673c138a50859c0e513732cb89fc8b (diff) | |
| parent | 1d94f7e9ebd663853c81d60aec796accadf43c70 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index 71d3ef6405..216556cf89 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -428,13 +428,7 @@ void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where) } else if (where == ACTION_APPLY_PARCEL) { - LLParcelSelectionHandle handle(LLViewerParcelMgr::instance().getParcelSelection()); - LLParcel *parcel(nullptr); - - if (handle) - parcel = handle->getParcel(); - if (!parcel) - parcel = LLViewerParcelMgr::instance().getAgentParcel(); + LLParcel *parcel(LLViewerParcelMgr::instance().getAgentOrSelectedParcel()); if ((!parcel) || (parcel->getLocalID() == INVALID_PARCEL_ID)) { |