diff options
| author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
| commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
| tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/newview/lltoastalertpanel.cpp | |
| parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
| parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) | |
Merge with tip before push
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 |