aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llsliderctrl.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llui/llsliderctrl.cpp
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llsliderctrl.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index c62ec9a..9a67bca 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2002-2007, Linden Research, Inc. 5 * Copyright (c) 2002-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -205,7 +206,7 @@ void LLSliderCtrl::clear()
205 206
206BOOL LLSliderCtrl::isMouseHeldDown() 207BOOL LLSliderCtrl::isMouseHeldDown()
207{ 208{
208 return gFocusMgr.getMouseCapture() == mSlider; 209 return mSlider->hasMouseCapture();
209} 210}
210 211
211void LLSliderCtrl::updateText() 212void LLSliderCtrl::updateText()
@@ -319,7 +320,7 @@ void LLSliderCtrl::onSliderCommit( LLUICtrl* caller, void *userdata )
319 320
320void LLSliderCtrl::setEnabled(BOOL b) 321void LLSliderCtrl::setEnabled(BOOL b)
321{ 322{
322 LLUICtrl::setEnabled( b ); 323 LLView::setEnabled( b );
323 324
324 if( mLabelBox ) 325 if( mLabelBox )
325 { 326 {