diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-26 17:42:25 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-26 17:42:25 -0700 |
| commit | 756532ba8a0a29ca7e5991d8a4f48ddac3bf06ac (patch) | |
| tree | 50e815635d579aa203f9b8dfb8414f2483bf568e /indra/llui/lldockcontrol.cpp | |
| parent | 53a486649381af53d21de28aced388bc2aacac0f (diff) | |
| parent | a465f816b8e7674aa3f22023d7708106ca35b350 (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(); |