diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-01 22:52:37 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-01 22:52:37 +0100 |
| commit | c98522a40ec6855a11a781301fca7a3943ba5a25 (patch) | |
| tree | bad6bfd113e55526105bc310530733758cdb3a21 /indra/newview/llfloatereditextdaycycle.cpp | |
| parent | c4941fc182585769e8e3151f98127c9b8c3221f2 (diff) | |
| parent | 1d94f7e9ebd663853c81d60aec796accadf43c70 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 8 |
1 files changed, 1 insertions, 7 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)) { |