summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-09-10 23:49:40 +0100
committerGraham Linden <graham@lindenlab.com>2018-09-10 23:49:40 +0100
commit3262446f07616f42ad0e4c77930b6ba2f03e452c (patch)
treeb7e9ca1c02e0a684a933f9112ec77b85939d217d
parent87cecc7679c259805c357cf9f7f264aa84cab3d0 (diff)
Put back new func dropped in merge.
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index b50b0ce34f..4cab1160c0 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1253,6 +1253,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;