diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-09-27 10:20:18 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-09-27 10:20:18 -0700 |
| commit | 7483d339ed8abe9785ddb33a72496bf8d4d63fa8 (patch) | |
| tree | 3529c865d0f8e10bfa5172b8ea3e5c909f1e5e43 /indra/llui/lldockcontrol.cpp | |
| parent | 795ae760e8b81a4e1b0ae4666d94d80919305189 (diff) | |
| parent | b7cf5ff947161d0b7e42a9ed8fe10741bb7af100 (diff) | |
merge
Diffstat (limited to 'indra/llui/lldockcontrol.cpp')
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index b1c27126d9..6e39fcd714 100644 --- a/indra/llui/lldockcontrol.cpp +++ b/indra/llui/lldockcontrol.cpp @@ -97,6 +97,7 @@ void LLDockControl::getAllowedRect(LLRect& rect) void LLDockControl::repositionDockable() { + if (!mDockWidget) return; LLRect dockRect = mDockWidget->calcScreenRect(); LLRect rootRect; mGetAllowedRectCallback(rootRect); @@ -160,7 +161,7 @@ bool LLDockControl::isDockVisible() case TOP: { // check is dock inside parent rect - // assume that parent for all dockable flaoters + // assume that parent for all dockable floaters // is the root view LLRect dockParentRect = mDockWidget->getRootView()->calcScreenRect(); |