From 4a0dd9ec76bfc9a3207b0e75608343f29fb26358 Mon Sep 17 00:00:00 2001 From: Cho 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llui/lldockcontrol.cpp') 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(); + mDockWidgetHandle = LLHandle(); mDockWidgetVisible = false; } } -- cgit v1.2.3