diff options
| author | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:18 +0000 |
| commit | 752b3fdbe044069635a2c6cd000c481561985954 (patch) | |
| tree | a162616b10fbabe65bf3a568c408e10e3cfd253a /indra/llui/lldockcontrol.cpp | |
| parent | b092de554c7745d7c3c19bd30803640f36431da2 (diff) | |
| parent | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (diff) | |
merge
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index 5ed2c27160..b1c27126d9 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -299,7 +299,7 @@ void LLDockControl::moveDockable() break; } - S32 max_available_height = rootRect.getHeight() - mDockTongueY - mDockTongue->getHeight(); + S32 max_available_height = rootRect.getHeight() - (rootRect.mBottom - mDockTongueY) - mDockTongue->getHeight(); // A floater should be shrunk so it doesn't cover a part of its docking tongue and // there is a space between a dockable floater and a control to which it is docked. |