diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/llui/lldockcontrol.cpp | |
parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) |
automated 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; |