diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-11 19:17:37 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-11 19:17:37 +0200 |
| commit | edcdaf27ceaf00cf075416ba196a25a89357a9d1 (patch) | |
| tree | 4aff9e3eb53689da75f6ef5e087ff54b6c3bcade /indra/newview/llweb.cpp | |
| parent | e56dae206e4774e16003d1f404a6814fd81a04d3 (diff) | |
| parent | 5f0b2624bc40c6c7580fa7c02f137c3dee330b94 (diff) | |
merge
--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); } |