diff options
| author | Runitai <> | 2009-12-15 16:53:29 -0600 |
|---|---|---|
| committer | Runitai <> | 2009-12-15 16:53:29 -0600 |
| commit | 1f8ad2651d82b81fc85d91f3d48663430427537e (patch) | |
| tree | c4ed86401b803aefdbfaa9eef6f87ecd5567c58d /indra/newview/llweb.cpp | |
| parent | a81a2f19b21134fb52df1e1a735988a04aa0688a (diff) | |
| parent | 88a146e0bb95476792d0fabedab6d7a41c350949 (diff) | |
Merge
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); } |