diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-01 16:15:34 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-01 16:15:34 +0000 |
| commit | 59a4a215de733926dfdb0d28a86ce5bfdfe84c43 (patch) | |
| tree | 8015355bda7ae817f604c86207449549b40576d3 | |
| parent | 50ec228b02026a4ddc3e108df6a8d7709c713d53 (diff) | |
| parent | 100fd88d2c6e29026b132b13bdb82278e3cd72c7 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #121)
SL-9755 EEP Cannot apply a new Sky setting to the parcel.
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 241c3ab59d..f01159f07c 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -1281,13 +1281,7 @@ void LLFloaterEditExtDayCycle::doApplyEnvironment(const std::string &where, cons } else if (where == ACTION_APPLY_PARCEL) { - LLParcelSelectionHandle handle(LLViewerParcelMgr::instance().getParcelSelection()); - LLParcel *parcel(nullptr); - - if (handle) - parcel = handle->getParcel(); - if (!parcel || (parcel->getLocalID() == INVALID_PARCEL_ID)) - parcel = LLViewerParcelMgr::instance().getAgentParcel(); + LLParcel *parcel(LLViewerParcelMgr::instance().getAgentOrSelectedParcel()); if ((!parcel) || (parcel->getLocalID() == INVALID_PARCEL_ID)) { 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)) { |