Backed out changeset: a38147a6cf50 (LL has a different fix for this)

indra/newview/llnotificationhandler.h

@@ -81,7 +81,6 @@ typedef enum e_notification_type
 //			- signal, that emits ID of the notification that is being processed
 //
 class LLEventHandler
-	: public LLScreenChannelBase::LLScreenChannelObserver // </FS:ND> derive from observer, so we get notified when the Channel we hold dies.
 {
 public:
 	virtual ~LLEventHandler() {};
@@ -111,10 +110,6 @@ protected:
 	LLScreenChannelBase*	mChannel;
 	e_notification_type		mType;
 
-	// <FS:ND> Channel is dead, remove it. Yay for mChannel being protected so every derived class just mucks with the pointer as it wishes. Otherwise we could register an observer as soon as mChannel is set.
-	virtual void observeDestruction( LLScreenChannelBase *)
-	{ mChannel = 0;	}
-	// </FS:ND>
 };
 
 // LLSysHandler and LLChatHandler are more specific base classes
@@ -262,7 +257,6 @@ protected:
  * Handler for offers notices.
  * It manages life time of offer notices.
  */
-
 class LLOfferHandler : public LLSysHandler
 {
 public:
@@ -272,7 +266,6 @@ public:
 	// base interface functions
 	virtual bool processNotification(const LLSD& notify);
 
-
 protected:
 	virtual void onDeleteToast(LLToast* toast);
 	virtual void initChannel();

indra/newview/llnotificationofferhandler.cpp

@@ -51,20 +51,11 @@ LLOfferHandler::LLOfferHandler(e_notification_type type, const LLSD& id)
 	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel);
 	if(channel)
 		channel->setOnRejectToastCallback(boost::bind(&LLOfferHandler::onRejectToast, this, _1));
-
-	// <FS:ND> Register with observer so we notice when mChannel diees
-	if( mChannel )
-		mChannel->setObserver( this );
-	// </FS:ND>
 }
 
 //--------------------------------------------------------------------------
 LLOfferHandler::~LLOfferHandler()
 {
-	// <FS:ND> Where are dead. In case we still hold a channel unregister
-	if( mChannel )
-		mChannel->setObserver( 0 );
-	// </FS:ND>
 }
 
 //--------------------------------------------------------------------------

indra/newview/llscreenchannel.cpp

@@ -125,16 +125,6 @@ LLScreenChannelBase::LLScreenChannelBase(const Params& p)
 
 	setMouseOpaque( false );
 	setVisible(FALSE);
-
-	mObserver = 0; // </FS:ND> Observerable
-}
-
-LLScreenChannelBase::~LLScreenChannelBase()
-{
-	// <FS:ND> Notofiy our observer that we're going down
-	if( mObserver )
-		mObserver->observeDestruction( this );
-	// </FS:ND>
 }
 
 BOOL LLScreenChannelBase::postBuild()
@@ -243,6 +233,7 @@ void LLScreenChannel::init(S32 channel_left, S32 channel_right)
 //--------------------------------------------------------------------------
 LLScreenChannel::~LLScreenChannel() 
 {
+	
 }
 
 std::list<LLToast*> LLScreenChannel::findToasts(const Matcher& matcher)

indra/newview/llscreenchannel.h

@@ -52,7 +52,6 @@ typedef enum e_channel_alignment
 class LLScreenChannelBase : public LLUICtrl
 {
 	friend class LLChannelManager;
-
 public:
 	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
 	{
@@ -70,7 +69,6 @@ public:
 	};
 
 	LLScreenChannelBase(const Params&);
-	virtual ~LLScreenChannelBase();
 	
 	BOOL postBuild();
 
@@ -144,22 +142,6 @@ protected:
 	
 	LLView*	mFloaterSnapRegion;
 	LLView* mChicletRegion;
-
-	// <FS:ND> Oberserver for ScreenChannelBase destruction
-public:
-	class LLScreenChannelObserver
-	{
-	public:
-		virtual ~LLScreenChannelObserver() {}
-		virtual void observeDestruction( LLScreenChannelBase *) = 0;
-	};
-
-	void setObserver( LLScreenChannelObserver *aObserver )
-	{ mObserver = aObserver; }
-
-private:
-	LLScreenChannelObserver *mObserver;
-	// </FS:ND>
 };
 
 
@@ -169,7 +151,6 @@ private:
 class LLScreenChannel : public LLScreenChannelBase
 {
 	friend class LLChannelManager;
-
 public:
 	LLScreenChannel(const Params&);
 	virtual ~LLScreenChannel();