diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-06 12:12:47 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-06 12:12:47 +0000 |
| commit | c189943583f13dba0b56d58e4e4adec4f7f7f650 (patch) | |
| tree | 7a048ff7e9d6f7e3d0ed897d772fc0ff96800976 /indra/newview/llweb.cpp | |
| parent | 56281befc1815fb26c25c75b8bf9f0295f43e319 (diff) | |
| parent | 1c591c06b72d222cff7775ef3aa067cba9c52cd3 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 3204c2d264..72431bd22f 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -43,8 +43,9 @@ #include "llfloatermediabrowser.h" #include "llfloaterreg.h" #include "llalertdialog.h" +#include "lltoastalertpanel.h" -class URLLoader : public LLAlertDialog::URLLoader +class URLLoader : public LLAlertURLLoader { virtual void load(const std::string& url , bool force_open_externally) { @@ -65,6 +66,7 @@ static URLLoader sAlertURLLoader; void LLWeb::initClass() { LLAlertDialog::setURLLoader(&sAlertURLLoader); + LLToastAlertPanel::setURLLoader(&sAlertURLLoader); } |