diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
| commit | b3641c35fe00ea93887ea8980bf69624c8299267 (patch) | |
| tree | 9b575e425986b3f0496192e95009ba2297158de3 /indra/llui/lldockcontrol.cpp | |
| parent | 2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff) | |
| parent | 244bef7d0cdb75f011f70d8cd834154eeb469088 (diff) | |
Merge with default branch
--HG--
branch : product-engine
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; |