diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 16:21:10 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 16:21:10 -0500 |
| commit | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (patch) | |
| tree | b96828988ee88dd86c6ac61f984a20a85aa62c92 /indra/newview/lltoastalertpanel.cpp | |
| parent | 0f5a7575407bcab51678a4f05884835e502cd3d3 (diff) | |
| parent | eafd52200d1c101c918384066465638f400aa033 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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 |