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

SL-9679 EEP - disable panel elements until data update, null cycle crash fix

meow-7.2.2
andreykproductengine 2018-09-19 17:48:41 +03:00
parent 8d627de478
commit ff8f5f52a4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterland.cpp
View File

@ -3340,8 +3340,8 @@ void LLPanelLandEnvironment::refreshFromSource()
setCrossRegion(true);
mCurrentEnvironment.reset();
mLastParcelId = INVALID_PARCEL_ID;
setControlsEnabled(false);
}
setControlsEnabled(false);
}

2
indra/newview/llfloaterregioninfo.cpp
View File

@ -3451,6 +3451,8 @@ void LLPanelRegionEnvironment::refreshFromSource()
LLEnvironment::instance().requestRegion(
[that_h](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) { _onEnvironmentReceived(that_h, parcel_id, envifo); });
setControlsEnabled(false);
}
void LLPanelRegionEnvironment::doApply()

4
indra/newview/llpanelenvironment.cpp
View File

@ -550,7 +550,7 @@ void LLPanelEnvironmentInfo::onBtnEdit()
(LLFloaterEditExtDayCycle::KEY_CANMOD, LLSD::Boolean(true)));
dayeditor->openFloater(params);
if (mCurrentEnvironment->mDayCycle)
if (mCurrentEnvironment && mCurrentEnvironment->mDayCycle)
dayeditor->setEditDayCycle(mCurrentEnvironment->mDayCycle);
else
dayeditor->setEditDefaultDayCycle();
@ -562,7 +562,7 @@ void LLPanelEnvironmentInfo::onBtnSelect()
if (picker)
{
picker->setSettingsFilter(LLSettingsType::ST_NONE);
picker->setSettingsAssetId((mCurrentEnvironment->mDayCycle) ? mCurrentEnvironment->mDayCycle->getAssetId() : LLUUID::null);
picker->setSettingsAssetId((mCurrentEnvironment && mCurrentEnvironment->mDayCycle) ? mCurrentEnvironment->mDayCycle->getAssetId() : LLUUID::null);
picker->openFloater();
picker->setFocus(TRUE);
}