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/lltoastalertpanel.h | |
| parent | a81a2f19b21134fb52df1e1a735988a04aa0688a (diff) | |
| parent | 88a146e0bb95476792d0fabedab6d7a41c350949 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltoastalertpanel.h')
| -rw-r--r-- | indra/newview/lltoastalertpanel.h | 19 |
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 |