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

MAINT-9066 EEP should not be able to delete all Keyframes from Ground Level or Water

meow-7.2.2
maxim_productengine 2018-09-10 17:31:31 +03:00
parent 8c9d758e3a
commit 598cd8a30f
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llinventory/llsettingsdaycycle.cpp
View File

@ -115,6 +115,7 @@ const LLSettingsDay::Seconds LLSettingsDay::DEFAULT_DAYOFFSET(57600); // +16 ho
const LLSettingsDay::Seconds LLSettingsDay::MAXIMUM_DAYOFFSET(86400); // 24 hours
const S32 LLSettingsDay::TRACK_WATER(0); // water track is 0
const S32 LLSettingsDay::TRACK_GROUND_LEVEL(1);
const S32 LLSettingsDay::TRACK_MAX(5); // 5 tracks, 4 skys, 1 water
const S32 LLSettingsDay::FRAME_MAX(56);

1
indra/llinventory/llsettingsdaycycle.h
View File

@ -60,6 +60,7 @@ public:
static const Seconds MAXIMUM_DAYOFFSET;
static const S32 TRACK_WATER;
static const S32 TRACK_GROUND_LEVEL;
static const S32 TRACK_MAX;
static const S32 FRAME_MAX;

14
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -842,7 +842,7 @@ void LLFloaterEditExtDayCycle::updateButtons()
//mAddFrameButton->setEnabled(can_add);
//mDeleteFrameButton->setEnabled(!can_add);
mAddFrameButton->setEnabled(true && mCanMod);
mDeleteFrameButton->setEnabled(true && mCanMod);
mDeleteFrameButton->setEnabled(isRemovingFrameAllowed() && mCanMod);
}
void LLFloaterEditExtDayCycle::updateSlider()
@ -1198,6 +1198,18 @@ void LLFloaterEditExtDayCycle::doApplyCommit()
}
}
bool LLFloaterEditExtDayCycle::isRemovingFrameAllowed()
{
if (mCurrentTrack <= LLSettingsDay::TRACK_GROUND_LEVEL)
{
return (mSliderKeyMap.size() > 1);
}
else
{
return (mSliderKeyMap.size() > 0);
}
}
void LLFloaterEditExtDayCycle::onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results)
{
LL_INFOS("ENVDAYEDIT") << "Inventory item " << inventory_id << " has been created with asset " << asset_id << " results are:" << results << LL_ENDL;

2
indra/newview/llfloatereditextdaycycle.h
View File

@ -166,6 +166,8 @@ private:
void setDirtyFlag() { mIsDirty = true; }
virtual void clearDirtyFlag();
bool isRemovingFrameAllowed();
LLSettingsDay::ptr_t mEditDay; // edited copy
LLSettingsDay::Seconds mDayLength;
U32 mCurrentTrack;