summaryrefslogtreecommitdiff
path: root/indra/newview/lltoastalertpanel.h
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-12-11 14:26:56 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-12-11 14:26:56 +0200
commit5aecd0b93f6d79ef447aca241b082f0fb468d78b (patch)
tree81dd8069b29ffaf5a468c5c32d3cf6415481fdb8 /indra/newview/lltoastalertpanel.h
parentce621eafd8a115cc6c13a124453bbbda1bc43e13 (diff)
parent4fc7b91a795fb4ad0eaf3b6c7a1779679889fcbf (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltoastalertpanel.h')
-rw-r--r--indra/newview/lltoastalertpanel.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/indra/newview/lltoastalertpanel.h b/indra/newview/lltoastalertpanel.h
index 38a635e8a4..875ab82c54 100644
--- a/indra/newview/lltoastalertpanel.h
+++ b/indra/newview/lltoastalertpanel.h
@@ -30,10 +30,6 @@
* $/LicenseInfo$
*/
-// *NOTE: this module is a copy-paste of llui/llalertdialog.h
-// Can we re-implement this as a subclass of LLAlertDialog and
-// avoid all this code duplication? It already caused EXT-2232.
-
#ifndef LL_TOASTALERTPANEL_H
#define LL_TOASTALERTPANEL_H
@@ -41,11 +37,9 @@
#include "llfloater.h"
#include "llui.h"
#include "llnotificationptr.h"
-#include "llalertdialog.h"
class LLButton;
class LLCheckBoxCtrl;
-class LLAlertDialogTemplate;
class LLLineEditor;
/**
@@ -62,7 +56,16 @@ class LLToastAlertPanel
public:
typedef bool (*display_callback_t)(S32 modal);
- static void setURLLoader(LLAlertURLLoader* loader)
+ class URLLoader
+ {
+ public:
+ virtual void load(const std::string& url, bool force_open_externally = 0) = 0;
+ virtual ~URLLoader()
+ {
+ }
+ };
+
+ static void setURLLoader(URLLoader* loader)
{
sURLLoader = loader;
}
@@ -95,7 +98,7 @@ private:
BOOL hasTitleBar() const;
private:
- static LLAlertURLLoader* sURLLoader;
+ static URLLoader* sURLLoader;
static LLControlGroup* sSettings;
struct ButtonData