summaryrefslogtreecommitdiff
path: root/indra/llui/lldockcontrol.h
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-02-08 19:16:38 +0000
committerCho <cho@lindenlab.com>2013-02-08 19:16:38 +0000
commit4a0dd9ec76bfc9a3207b0e75608343f29fb26358 (patch)
treeca78c80c037564108bc96d7b9593003963858510 /indra/llui/lldockcontrol.h
parentc55e4a61242cd3cf94e0a28398fd33a4eb8ea683 (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.h')
-rw-r--r--indra/llui/lldockcontrol.h4
1 files changed, 2 insertions, 2 deletions
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;