diff options
author | Cho <cho@lindenlab.com> | 2013-02-08 19:16:38 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-02-08 19:16:38 +0000 |
commit | 4a0dd9ec76bfc9a3207b0e75608343f29fb26358 (patch) | |
tree | ca78c80c037564108bc96d7b9593003963858510 /indra/llui/lldockcontrol.cpp | |
parent | c55e4a61242cd3cf94e0a28398fd33a4eb8ea683 (diff) |
CHUI-703 FIX Notification buttons: "Join","Decline","Info" are duplicated after relogin while group invitation
Renamed LLDockControl::mDockWidget to mDockWidgetHandle for clarity
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
-rw-r--r-- | indra/llui/lldockcontrol.cpp | 6 |
1 files changed, 3 insertions, 3 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; } } |