diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-08-26 11:43:45 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-08-26 11:43:45 -0700 |
| commit | 1f656735d339fc4d83da86efbb400af1361c27db (patch) | |
| tree | da05e8dbe4bbcbaf1c248df9799534e546123897 /indra/newview/llpanelenvironment.cpp | |
| parent | 98d926afd7fba39cac373a89705851ad8bb2258e (diff) | |
SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.
Diffstat (limited to 'indra/newview/llpanelenvironment.cpp')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index d63ae4e434..c4fa4244b1 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -440,6 +440,7 @@ void LLPanelEnvironmentInfo::updateEditFloater(const LLEnvironment::EnvironmentI // old settings will be invalid. mEditorLastParcelId = nextenv->mParcelId; mEditorLastRegionId = nextenv->mRegionId; + dayeditor->setEditDayCycle(nextenv->mDayCycle); } } @@ -967,12 +968,23 @@ void LLPanelEnvironmentInfo::onPickerCommitted(LLUUID item_id, S32 track_num) clearDirtyFlag(DIRTY_FLAG_DAYLENGTH); clearDirtyFlag(DIRTY_FLAG_DAYOFFSET); + U32 flags(0); + + if (itemp) + { + if (!itemp->getPermissions().allowOperationBy(PERM_MODIFY, gAgent.getID())) + flags |= LLSettingsBase::FLAG_NOMOD; + if (!itemp->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) + flags |= LLSettingsBase::FLAG_NOTRANS; + } + LLEnvironment::instance().updateParcel(getParcelId(), itemp->getAssetUUID(), itemp->getName(), track_num, mCurrentEnvironment ? mCurrentEnvironment->mDayLength.value() : -1, mCurrentEnvironment ? mCurrentEnvironment->mDayOffset.value() : -1, + flags, LLEnvironment::altitudes_vect_t(), [that_h](S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo) { _onEnvironmentReceived(that_h, parcel_id, envifo); }); } |