diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-11 14:26:56 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-11 14:26:56 +0200 |
| commit | 5aecd0b93f6d79ef447aca241b082f0fb468d78b (patch) | |
| tree | 81dd8069b29ffaf5a468c5c32d3cf6415481fdb8 /indra/newview/llweb.cpp | |
| parent | ce621eafd8a115cc6c13a124453bbbda1bc43e13 (diff) | |
| parent | 4fc7b91a795fb4ad0eaf3b6c7a1779679889fcbf (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
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 72431bd22f..c056c84e19 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -42,10 +42,9 @@ #include "llviewercontrol.h" #include "llfloatermediabrowser.h" #include "llfloaterreg.h" -#include "llalertdialog.h" #include "lltoastalertpanel.h" -class URLLoader : public LLAlertURLLoader +class URLLoader : public LLToastAlertPanel::URLLoader { virtual void load(const std::string& url , bool force_open_externally) { @@ -65,7 +64,6 @@ static URLLoader sAlertURLLoader; // static void LLWeb::initClass() { - LLAlertDialog::setURLLoader(&sAlertURLLoader); LLToastAlertPanel::setURLLoader(&sAlertURLLoader); } |