diff options
| author | richard <none@none> | 2009-12-17 09:57:43 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 09:57:43 -0800 |
| commit | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (patch) | |
| tree | 8e77e822118f4979759caab99df48975f79994c7 /indra/newview/lltoastalertpanel.cpp | |
| parent | f452c01915be011814d92dcc1a398f450b6ce9c2 (diff) | |
| parent | 4dd37a10633c95a9806b608b4db4d0a2d3141a21 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoastalertpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastalertpanel.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index a4f5164a8d..c48301fa1e 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -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. - #include "llviewerprecompiledheaders.h" // must be first include #include "linden_common.h" @@ -60,7 +56,7 @@ const F32 DEFAULT_BUTTON_DELAY = 0.5f; const S32 MSG_PAD = 8; /*static*/ LLControlGroup* LLToastAlertPanel::sSettings = NULL; -/*static*/ LLAlertURLLoader* LLToastAlertPanel::sURLLoader; +/*static*/ LLToastAlertPanel::URLLoader* LLToastAlertPanel::sURLLoader; //----------------------------------------------------------------------------- // Private methods |