From af98aad98d43ec8b128ecac3089426d6ae6edc3f Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 26 Aug 2009 20:47:27 +0000
Subject: svn merge
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471
https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 ->
viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455
EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558
EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568
EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601
EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632
EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682
EXT-692 EXT-703 EXT-717
---
indra/newview/lltoastalertpanel.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'indra/newview/lltoastalertpanel.h')
diff --git a/indra/newview/lltoastalertpanel.h b/indra/newview/lltoastalertpanel.h
index 543c14d404..af0c9a9ddd 100644
--- a/indra/newview/lltoastalertpanel.h
+++ b/indra/newview/lltoastalertpanel.h
@@ -52,8 +52,7 @@ class LLLineEditor;
*/
class LLToastAlertPanel
- : public LLToastPanel,
- public LLFloater
+ : public LLToastPanel
{
public:
typedef bool (*display_callback_t)(S32 modal);
--
cgit v1.2.3