aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2012-03-09 02:39:14 +0000
committerMelanie2012-03-09 02:39:14 +0000
commitdc5f831ca8bcaed77b65934a1c6d70c315a3834a (patch)
tree5f45c7e163096ef23f5139b9ddd3566a3621cd03 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentMerge branch 'master' into careminster (diff)
parentSimplify minimap coarse location code by just reference SP.AbsolutePosition (diff)
downloadopensim-SC_OLD-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.zip
opensim-SC_OLD-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.gz
opensim-SC_OLD-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.bz2
opensim-SC_OLD-dc5f831ca8bcaed77b65934a1c6d70c315a3834a.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs24
1 files changed, 3 insertions, 21 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a320601..3cd4a10 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -230,27 +230,9 @@ namespace OpenSim.Region.Framework.Scenes
230 if (sp.IsChildAgent) 230 if (sp.IsChildAgent)
231 continue; 231 continue;
232 232
233 if (sp.ParentID != 0) 233 coarseLocations.Add(sp.AbsolutePosition);
234 { 234
235 // sitting avatar 235 avatarUUIDs.Add(sp.UUID);
236 SceneObjectPart sop = m_parentScene.GetSceneObjectPart(sp.ParentID);
237 if (sop != null)
238 {
239 coarseLocations.Add(sop.AbsolutePosition + sp.OffsetPosition);
240 avatarUUIDs.Add(sp.UUID);
241 }
242 else
243 {
244 // we can't find the parent.. ! arg!
245 coarseLocations.Add(sp.AbsolutePosition);
246 avatarUUIDs.Add(sp.UUID);
247 }
248 }
249 else
250 {
251 coarseLocations.Add(sp.AbsolutePosition);
252 avatarUUIDs.Add(sp.UUID);
253 }
254 } 236 }
255 } 237 }
256 238