summaryrefslogtreecommitdiff
path: root/indra/llui/lldockcontrol.h
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-11 15:05:47 -0400
committerprep <prep@lindenlab.com>2013-03-11 15:05:47 -0400
commite0c9174609e2457fab7fe6d7291c6ebbd030397c (patch)
treea6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/llui/lldockcontrol.h
parent9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff)
parent207d9fd767895a3470722fb298eeef4f338e479a (diff)
merge
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 c9602011f6..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;
+ return mDockWidgetHandle.get();
}
void repositionDockable();
void drawToungue();
@@ -83,7 +83,7 @@ private:
bool mRecalculateDockablePosition;
bool mDockWidgetVisible;
DocAt mDockAt;
- LLView* mDockWidget;
+ LLHandle<LLView> mDockWidgetHandle;
LLRect mPrevDockRect;
LLRect mRootRect;
LLRect mFloaterRect;