diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-14 09:32:00 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-14 09:32:00 -0500 |
| commit | 274cbf1a0b9b9965432328025e9148df6a2d49da (patch) | |
| tree | 07baf21128941ae23f338406ada061f6ed94b565 /indra/newview/llappviewer.cpp | |
| parent | ebf0b70e05f2d6539dd14c28a8a327105523025d (diff) | |
| parent | 5a31ac4aee6b41d1b948dc0aa4420cbd5e765ce3 (diff) | |
merge changes for vmrg-184
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c937f604fc..8bf4d94059 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -847,9 +847,9 @@ bool LLAppViewer::init() LLWeb::initClass(); // do this after LLUI // Provide the text fields with callbacks for opening Urls - LLUrlAction::setOpenURLCallback(&LLWeb::loadURL); - LLUrlAction::setOpenURLInternalCallback(&LLWeb::loadURLInternal); - LLUrlAction::setOpenURLExternalCallback(&LLWeb::loadURLExternal); + LLUrlAction::setOpenURLCallback(boost::bind(&LLWeb::loadURL, _1, LLStringUtil::null, LLStringUtil::null)); + LLUrlAction::setOpenURLInternalCallback(boost::bind(&LLWeb::loadURLInternal, _1, LLStringUtil::null, LLStringUtil::null)); + LLUrlAction::setOpenURLExternalCallback(boost::bind(&LLWeb::loadURLExternal, _1, true, LLStringUtil::null)); LLUrlAction::setExecuteSLURLCallback(&LLURLDispatcher::dispatchFromTextEditor); // Let code in llui access the viewer help floater |