From 24b26d71ee01211aa796b8061b66ec06a133e4ce Mon Sep 17 00:00:00 2001
From: Dave Simmons <simon@lindenlab.com>
Date: Fri, 20 Mar 2009 20:00:47 +0000
Subject: svn merge -r113004:115000
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge
 latest 1.26 into trunk

---
 indra/newview/llprogressview.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/llprogressview.cpp')

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index cdcd68de38..86f590a0f0 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -89,8 +89,7 @@ BOOL LLProgressView::postBuild()
 
 	getChild<LLTextBox>("title_text")->setText(LLStringExplicit(LLAppViewer::instance()->getSecondLifeTitle()));
 
-	getChild<LLTextBox>("message_text")->setClickedCallback(onClickMessage);
-	getChild<LLTextBox>("message_text")->setCallbackUserData(this);
+	getChild<LLTextBox>("message_text")->setClickedCallback(onClickMessage, this);
 
 	sInstance = this;
 	return TRUE;
-- 
cgit v1.2.3