Merge

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 7d20a27813..01d4dd631d 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -590,7 +590,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
     {
@@ -657,7 +657,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();
 
@@ -681,7 +681,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);