diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-08 20:52:32 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-08 20:52:32 -0800 |
| commit | 22bc40ad60d166cd9e8ff90671a6171a1954cd9b (patch) | |
| tree | 6ed30be7eb008fae2d03ba6ac84ab6225c91c344 /indra/llui/lldockcontrol.h | |
| parent | 2e2026a4f8359aba26e330fc8ec9ce4a3d40e666 (diff) | |
| parent | ec6c132e14e5f405bfa65a052b617cc2ace87bda (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/llui/lldockcontrol.h')
| -rw-r--r-- | indra/llui/lldockcontrol.h | 4 |
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; |