diff options
| author | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
|---|---|---|
| committer | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
| commit | 24b26d71ee01211aa796b8061b66ec06a133e4ce (patch) | |
| tree | 96bffcd019c933ad3ebbfd5f096968108b22aab5 /indra/newview/llprogressview.cpp | |
| parent | 5dfd435872e36445dcc82f99443dfc5a7ee0805a (diff) | |
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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; |