diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-06 12:54:33 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-06 12:54:33 -0800 |
| commit | 9317e46a878b36d8f44bbeb4a06ad22d66772e66 (patch) | |
| tree | 71bdb2fbd3cc931c886c81b404aa02f80f14bea7 /indra/newview/llweb.cpp | |
| parent | 7caf37b9778d3f515a3a796547c09533bd4816b8 (diff) | |
| parent | 05baf9940bd8e9491c4cc7fb426d8e56f50e4d22 (diff) | |
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
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); } |