summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-02-22 14:57:25 -0800
committerGraham Linden <graham@lindenlab.com>2019-02-22 14:57:25 -0800
commit5037e95a5b470133e7b96f5f295c5fc8e803652d (patch)
tree131af8acc2dcb8c127ffcf13442e8fd3c95e880d /indra
parent4aad62006259c20bcdda1495138f7313b8f35e8d (diff)
parentd60925e3b4c49f6203be01a56b584c70da8eb506 (diff)
Merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 3b148fa89e..18f22bf2d2 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -838,20 +838,10 @@ void LLFloaterEditExtDayCycle::onCloneTrack()
args.append(track);
}
- if (populated_counter > 1)
+ if (populated_counter > 0)
{
doOpenTrackFloater(args);
}
- else if (populated_counter > 0)
- {
- for (U32 i = 1; i < LLSettingsDay::TRACK_MAX; i++)
- {
- if ((!mEditDay->isTrackEmpty(i)) && (i != mCurrentTrack))
- {
- onPickerCommitTrackId(i);
- }
- }
- }
else
{
// Should not happen