diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-01 00:44:07 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-01 00:44:07 +0000 |
| commit | 9318da22817197f561620444533b692ed8556071 (patch) | |
| tree | 1ae8412564ccd3cc31d7c1ea75ab5a4b27f11441 /indra/newview/llselectmgr.cpp | |
| parent | 109cd6845b5ad338d3b10f3b482c5a8fc27000ba (diff) | |
svn merge -r 58437:58503 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 268ea8c363..046029ea1e 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5532,7 +5532,7 @@ void LLSelectMgr::updateSelectionCenter() } } - if ( !(gAgentID == LLUUID::null) ) + if ( !(gAgentID == LLUUID::null) && gToolMgr) { LLTool *tool = gToolMgr->getCurrentTool(); if (mShowSelection) |