diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-26 18:51:49 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-26 18:51:49 -0700 |
| commit | 67c9f1daa7a631ba09ef94387665d226e3193a6a (patch) | |
| tree | 85ea8ec87932ce9759b11726305252881bd695db /indra/llui/lldockcontrol.cpp | |
| parent | 87318979bf8ce1ba68c1e90190737cf99ecc7c50 (diff) | |
| parent | 7fd0e8c69e6dced4a770da4fac10c154eac5899f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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(); |