From 58bce2d205bee3f5adb33b15efe73098e77429eb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 9 Sep 2009 01:26:44 +0000
Subject: merge -r132032-132812
 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

---
 indra/llui/llscrollbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/llscrollbar.cpp')

diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index b46915b379..172c4a9c65 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -484,7 +484,7 @@ void LLScrollbar::draw()
 
 	S32 local_mouse_x;
 	S32 local_mouse_y;
-	LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
+	LLUI::getMousePositionLocal(this, &local_mouse_x, &local_mouse_y);
 	BOOL other_captor = gFocusMgr.getMouseCapture() && gFocusMgr.getMouseCapture() != this;
 	BOOL hovered = getEnabled() && !other_captor && (hasMouseCapture() || mThumbRect.pointInRect(local_mouse_x, local_mouse_y));
 	if (hovered)
-- 
cgit v1.2.3