1 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 0cd9390..4bd79e6 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -128,7 +128,7 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
                 &LLLineEditor::prevalidateFloat );
         mEditor->setFollowsLeft();
         mEditor->setFollowsBottom();
-        mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus );
+        mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus, this );
         //RN: this seems to be a BAD IDEA, as it makes the editor behavior different when it has focus
         // than when it doesn't.  Instead, if you always have to double click to select all the text, 
         // it's easier to understand
@@ -137,7 +137,7 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
         addChild(mEditor);
 
         updateEditor();
-        setSpanChildren( TRUE );
+        setUseBoundingRect( TRUE );
 }
 
 LLSpinCtrl::~LLSpinCtrl()
@@ -230,7 +230,7 @@ void LLSpinCtrl::onDownBtn( void *userdata )
 }
 
 // static
-void LLSpinCtrl::onEditorGainFocus( LLUICtrl* caller, void *userdata )
+void LLSpinCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata )
 {
         LLSpinCtrl* self = (LLSpinCtrl*) userdata;
         llassert( caller == self->mEditor );