diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
commit | 04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch) | |
tree | b0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/llui/lldockcontrol.cpp | |
parent | aaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff) | |
parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) |
merge.
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
-rw-r--r-- | indra/llui/lldockcontrol.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index 0d8e54aa48..d836a5f4cd 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -37,7 +37,11 @@ LLDockControl::LLDockControl(LLView* dockWidget, LLFloater* dockableFloater, const LLUIImagePtr& dockTongue, DocAt dockAt, get_allowed_rect_callback_t get_allowed_rect_callback) : - mDockWidget(dockWidget), mDockableFloater(dockableFloater), mDockTongue(dockTongue) + mDockWidget(dockWidget), + mDockableFloater(dockableFloater), + mDockTongue(dockTongue), + mDockTongueX(0), + mDockTongueY(0) { mDockAt = dockAt; |