diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 16:21:10 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 16:21:10 -0500 |
| commit | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (patch) | |
| tree | b96828988ee88dd86c6ac61f984a20a85aa62c92 /indra/newview/llweb.cpp | |
| parent | 0f5a7575407bcab51678a4f05884835e502cd3d3 (diff) | |
| parent | eafd52200d1c101c918384066465638f400aa033 (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, 1 insertions, 3 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 045bef294e..f8bb7336db 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -38,7 +38,6 @@ // Library includes #include "llwindow.h" // spawnWebBrowser() -#include "llalertdialog.h" #include "llappviewer.h" #include "llfloatermediabrowser.h" #include "llfloaterreg.h" @@ -52,7 +51,7 @@ #include "llviewernetwork.h" #include "llviewerwindow.h" -class URLLoader : public LLAlertURLLoader +class URLLoader : public LLToastAlertPanel::URLLoader { virtual void load(const std::string& url , bool force_open_externally) { @@ -72,7 +71,6 @@ static URLLoader sAlertURLLoader; // static void LLWeb::initClass() { - LLAlertDialog::setURLLoader(&sAlertURLLoader); LLToastAlertPanel::setURLLoader(&sAlertURLLoader); } |