From 9318da22817197f561620444533b692ed8556071 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 1 Mar 2007 00:44:07 +0000 Subject: svn merge -r 58437:58503 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --- indra/newview/llagent.cpp | 2 ++ indra/newview/llselectmgr.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index caeee9f210..8951d0ef33 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -834,6 +834,8 @@ void LLAgent::setRegion(LLViewerRegion *regionp) // we could trake this at the dataserver side, but that's harder U64 handle = regionp->getHandle(); mRegionsVisited.insert(handle); + + gSelectMgr->updateSelectionCenter(); } 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) -- cgit v1.2.3