summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-09-06 21:29:28 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-09-06 21:29:28 +0300
commite539236a75a163b1c6748617bd1e4d2b84aaa3d6 (patch)
treeb1ac6d1694d25aa5c4abe8d2e42b1fdbd255559a /indra/newview
parent14107dd0625af06dcf2019940eaf8e8d66585658 (diff)
MAINT-9099 Implementation of vertical orientation support for multislider
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 94da304a96..01c1bf3d1a 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -588,7 +588,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderCallback(const LLSD &data)
S32 x(0), y(0);
LLUI::getMousePositionLocal(mFramesSlider, &x, &y);
- sliderpos = mFramesSlider->getSliderValueFromX(x);
+ sliderpos = mFramesSlider->getSliderValueFromPos(x, y);
}
else
{
@@ -655,7 +655,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderDoubleClick(S32 x, S32 y, MASK mask)
void LLFloaterEditExtDayCycle::onFrameSliderMouseDown(S32 x, S32 y, MASK mask)
{
stopPlay();
- F32 sliderpos = mFramesSlider->getSliderValueFromX(x);
+ F32 sliderpos = mFramesSlider->getSliderValueFromPos(x, y);
std::string slidername = mFramesSlider->getCurSlider();
@@ -679,7 +679,7 @@ void LLFloaterEditExtDayCycle::onFrameSliderMouseDown(S32 x, S32 y, MASK mask)
void LLFloaterEditExtDayCycle::onFrameSliderMouseUp(S32 x, S32 y, MASK mask)
{
- F32 sliderpos = mFramesSlider->getSliderValueFromX(x);
+ F32 sliderpos = mFramesSlider->getSliderValueFromPos(x, y);
mTimeSlider->setCurSliderValue(sliderpos);
selectFrame(sliderpos, LLSettingsDay::DEFAULT_FRAME_SLOP_FACTOR);