diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-29 18:03:39 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-29 18:03:39 +0300 |
| commit | 6a463a41fec89c7f1eadb77c16eeae169ff777d0 (patch) | |
| tree | f297c32418eb139eded752ce99b418773328e458 /indra/llui/lldockcontrol.cpp | |
| parent | c44db34a15abd2e96b8fd461e9fb3e217fe648cc (diff) | |
| parent | 71ed326f51770b215ba5dd2ac8d159c3b764c2d2 (diff) | |
Merge sergeylproductengine/viewer-experience-fui with 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(); |