diff options
| author | Richard Linden <none@none> | 2011-09-23 19:56:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-23 19:56:59 -0700 |
| commit | 3b41527537d814c6a59d912bc9e0c37654697a10 (patch) | |
| tree | 62e80eb3746a2fbe05d3e7beb4112286bfe281ce | |
| parent | c837f5eccbb298378ec84907da63fa35f91681c3 (diff) | |
| parent | 6aa7ddc238b1a8f8a4dd184dd2758f93f6a55bec (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
| -rw-r--r-- | indra/llui/lldockcontrol.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp index b1c27126d9..7b9084671d 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); |