livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
meow-7.2.2
Rider Linden 2018-10-01 16:15:34 +00:00
parent 50ec228b02 100fd88d2c
commit 59a4a215de
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -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))
{

8
indra/newview/llfloaterfixedenvironment.cpp
View File

@ -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))
{