Merged bug fixes by Mm Alder and Admiral Admiral.

1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/llui/llmultisliderctrl.cpp b/linden/indra/llui/llmultisliderctrl.cpp
index 8bcf9f9..b76c2f6 100644
--- a/linden/indra/llui/llmultisliderctrl.cpp
+++ b/linden/indra/llui/llmultisliderctrl.cpp
@@ -132,7 +132,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const std::string& name, const LLRect& rect
                                 &LLLineEditor::prevalidateFloat );
                         mEditor->setFollowsLeft();
                         mEditor->setFollowsBottom();
-                        mEditor->setFocusReceivedCallback( &LLMultiSliderCtrl::onEditorGainFocus );
+                        mEditor->setFocusReceivedCallback( &LLMultiSliderCtrl::onEditorGainFocus, this );
                         mEditor->setIgnoreTab(TRUE);
                         // don't do this, as selecting the entire text is single clicking in some cases
                         // and double clicking in others
@@ -501,6 +501,8 @@ LLXMLNodePtr LLMultiSliderCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_MULTI_SLIDER_CTRL_TAG);
+
         node->createChild("show_text", TRUE)->setBoolValue(mShowText);
 
         node->createChild("can_edit_text", TRUE)->setBoolValue(mCanEditText);