From 4a0dd9ec76bfc9a3207b0e75608343f29fb26358 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 8 Feb 2013 19:16:38 +0000
Subject: CHUI-703 FIX Notification buttons: "Join","Decline","Info" are
 duplicated after relogin while group invitation Renamed
 LLDockControl::mDockWidget to mDockWidgetHandle for clarity

---
 indra/llui/lldockcontrol.cpp | 6 +++---
 indra/llui/lldockcontrol.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp
index 602113432e..bd42497cb6 100644
--- a/indra/llui/lldockcontrol.cpp
+++ b/indra/llui/lldockcontrol.cpp
@@ -40,7 +40,7 @@ LLDockControl::LLDockControl(LLView* dockWidget, LLFloater* dockableFloater,
 
 	if (dockWidget != NULL)
 	{
-		mDockWidget = dockWidget->getHandle();
+		mDockWidgetHandle = dockWidget->getHandle();
 	}
 
 	if (dockableFloater->isDocked())
@@ -84,13 +84,13 @@ void LLDockControl::setDock(LLView* dockWidget)
 {
 	if (dockWidget != NULL)
 	{
-		mDockWidget = dockWidget->getHandle();
+		mDockWidgetHandle = dockWidget->getHandle();
 		repositionDockable();
 		mDockWidgetVisible = isDockVisible();
 	}
 	else
 	{
-		mDockWidget = LLHandle<LLView>();
+		mDockWidgetHandle = LLHandle<LLView>();
 		mDockWidgetVisible = false;
 	}
 }
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h
index a1cfa0072c..98a9c7236d 100644
--- a/indra/llui/lldockcontrol.h
+++ b/indra/llui/lldockcontrol.h
@@ -63,7 +63,7 @@ public:
 	void setDock(LLView* dockWidget);
 	LLView* getDock()
 	{
-		return mDockWidget.get();
+		return mDockWidgetHandle.get();
 	}
 	void repositionDockable();
 	void drawToungue();
@@ -83,7 +83,7 @@ private:
 	bool mRecalculateDockablePosition;
 	bool mDockWidgetVisible;
 	DocAt mDockAt;
-	LLHandle<LLView> mDockWidget;
+	LLHandle<LLView> mDockWidgetHandle;
 	LLRect mPrevDockRect;
 	LLRect mRootRect;
 	LLRect mFloaterRect;
-- 
cgit v1.2.3