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

Merge

meow-7.2.2
Rider Linden 2018-09-27 10:14:09 -07:00
parent 337beb56f9 3cfeff4bb3
commit 7597e4ecfd
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -1423,19 +1423,7 @@ bool LLFloaterEditExtDayCycle::canApplyRegion() const
bool LLFloaterEditExtDayCycle::canApplyParcel() const
{
LLParcelSelectionHandle handle(LLViewerParcelMgr::instance().getParcelSelection());
LLParcel *parcel(nullptr);
if (handle)
parcel = handle->getParcel();
if (!parcel)
parcel = LLViewerParcelMgr::instance().getAgentParcel();
if (!parcel)
return false;
return parcel->allowTerraformBy(gAgent.getID()) &&
LLEnvironment::instance().isExtendedEnvironmentEnabled();
return LLEnvironment::instance().canAgentUpdateParcelEnvironment();
}
void LLFloaterEditExtDayCycle::startPlay()

14
indra/newview/llfloaterfixedenvironment.cpp
View File

@ -571,19 +571,7 @@ bool LLFloaterFixedEnvironment::canApplyRegion() const
bool LLFloaterFixedEnvironment::canApplyParcel() const
{
LLParcelSelectionHandle handle(LLViewerParcelMgr::instance().getParcelSelection());
LLParcel *parcel(nullptr);
if (handle)
parcel = handle->getParcel();
if (!parcel)
parcel = LLViewerParcelMgr::instance().getAgentParcel();
if (!parcel)
return false;
return parcel->allowModifyBy(gAgent.getID(), gAgent.getGroupID()) &&
LLEnvironment::instance().isExtendedEnvironmentEnabled();
return LLEnvironment::instance().canAgentUpdateParcelEnvironment();
}
//=========================================================================