1 files changed, 10 insertions, 9 deletions
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index d23e858c5c..242f786bf2 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -114,11 +114,11 @@ public:
 
 	//Fading
 
-	/** Stop fading timer */
-	virtual void stopFading();
+	/** Stop lifetime/fading timer */
+	virtual void stopTimer();
 
-	/** Start fading timer */
-	virtual void startFading();
+	/** Start lifetime/fading timer */
+	virtual void startTimer();
 
 	bool isHovered();
 
@@ -141,7 +141,7 @@ public:
 	//
 	virtual void setVisible(BOOL show);
 
-	virtual void setBackgroundOpaque(BOOL b);
+	/*virtual*/ void setBackgroundOpaque(BOOL b);
 	//
 	virtual void hide();
 
@@ -198,9 +198,8 @@ public:
 
 	LLHandle<LLToast> getHandle() { mHandle.bind(this); return mHandle; }
 
-	bool			getTransparentState() const { return mIsTransparent; }
-	virtual void	setTransparentState(bool transparent);
-
+protected:
+	void updateTransparency();
 
 private:
 
@@ -210,6 +209,8 @@ private:
 
 	void expire();
 
+	void setFading(bool fading);
+
 	LLUUID				mNotificationID;
 	LLUUID				mSessionID;
 	LLNotificationPtr	mNotification;
@@ -234,7 +235,7 @@ private:
 	bool		mHideBtnPressed;
 	bool		mIsHidden;  // this flag is TRUE when a toast has faded or was hidden with (x) button (EXT-1849)
 	bool		mIsTip;
-	bool		mIsTransparent;
+	bool		mIsFading;
 
 	commit_signal_t mToastMouseEnterSignal;
 	commit_signal_t mToastMouseLeaveSignal;