summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-03-01 00:44:07 +0000
committerJosh Bell <josh@lindenlab.com>2007-03-01 00:44:07 +0000
commit9318da22817197f561620444533b692ed8556071 (patch)
tree1ae8412564ccd3cc31d7c1ea75ab5a4b27f11441 /indra/newview
parent109cd6845b5ad338d3b10f3b482c5a8fc27000ba (diff)
svn merge -r 58437:58503 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llagent.cpp2
-rw-r--r--indra/newview/llselectmgr.cpp2
2 files changed, 3 insertions, 1 deletions
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)