diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llsliderctrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp index 8bb8e24..17854d0 100644 --- a/linden/indra/llui/llsliderctrl.cpp +++ b/linden/indra/llui/llsliderctrl.cpp | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -125,7 +125,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect, | |||
125 | &LLLineEditor::prevalidateFloat ); | 125 | &LLLineEditor::prevalidateFloat ); |
126 | mEditor->setFollowsLeft(); | 126 | mEditor->setFollowsLeft(); |
127 | mEditor->setFollowsBottom(); | 127 | mEditor->setFollowsBottom(); |
128 | mEditor->setFocusReceivedCallback( &LLSliderCtrl::onEditorGainFocus ); | 128 | mEditor->setFocusReceivedCallback( &LLSliderCtrl::onEditorGainFocus, this ); |
129 | mEditor->setIgnoreTab(TRUE); | 129 | mEditor->setIgnoreTab(TRUE); |
130 | // don't do this, as selecting the entire text is single clicking in some cases | 130 | // don't do this, as selecting the entire text is single clicking in some cases |
131 | // and double clicking in others | 131 | // and double clicking in others |
@@ -150,7 +150,7 @@ LLSliderCtrl::~LLSliderCtrl() | |||
150 | } | 150 | } |
151 | 151 | ||
152 | // static | 152 | // static |
153 | void LLSliderCtrl::onEditorGainFocus( LLUICtrl* caller, void *userdata ) | 153 | void LLSliderCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata ) |
154 | { | 154 | { |
155 | LLSliderCtrl* self = (LLSliderCtrl*) userdata; | 155 | LLSliderCtrl* self = (LLSliderCtrl*) userdata; |
156 | llassert( caller == self->mEditor ); | 156 | llassert( caller == self->mEditor ); |