aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2009-10-15 21:16:05 +0100
committerMelanie2009-10-15 21:16:05 +0100
commit642084c2a94523fa1dbe00e8c787d4da549881ca (patch)
tree8af3f8bbbd01ddfbc22980291ada1cf896ddf948 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' into vehicles (diff)
parentminor: Change commented out authentication service realm setting to "users" t... (diff)
downloadopensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.zip
opensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.gz
opensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.bz2
opensim-SC_OLD-642084c2a94523fa1dbe00e8c787d4da549881ca.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 15fb11f..646a483 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2507,8 +2507,9 @@ namespace OpenSim.Region.Framework.Scenes
2507 List<ScenePresence> avatars = m_scene.GetAvatars(); 2507 List<ScenePresence> avatars = m_scene.GetAvatars();
2508 for (int i = 0; i < avatars.Count; i++) 2508 for (int i = 0; i < avatars.Count; i++)
2509 { 2509 {
2510 if (avatars[i] != this) 2510 // Requested by LibOMV. Send Course Location on self.
2511 { 2511 //if (avatars[i] != this)
2512 //{
2512 if (avatars[i].ParentID != 0) 2513 if (avatars[i].ParentID != 0)
2513 { 2514 {
2514 // sitting avatar 2515 // sitting avatar
@@ -2530,7 +2531,7 @@ namespace OpenSim.Region.Framework.Scenes
2530 CoarseLocations.Add(avatars[i].m_pos); 2531 CoarseLocations.Add(avatars[i].m_pos);
2531 AvatarUUIDs.Add(avatars[i].UUID); 2532 AvatarUUIDs.Add(avatars[i].UUID);
2532 } 2533 }
2533 } 2534 //}
2534 } 2535 }
2535 2536
2536 m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations); 2537 m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations);
@@ -3841,6 +3842,9 @@ namespace OpenSim.Region.Framework.Scenes
3841 List<int> attPoints = m_appearance.GetAttachedPoints(); 3842 List<int> attPoints = m_appearance.GetAttachedPoints();
3842 foreach (int p in attPoints) 3843 foreach (int p in attPoints)
3843 { 3844 {
3845 if (m_isDeleted)
3846 return;
3847
3844 UUID itemID = m_appearance.GetAttachedItem(p); 3848 UUID itemID = m_appearance.GetAttachedItem(p);
3845 UUID assetID = m_appearance.GetAttachedAsset(p); 3849 UUID assetID = m_appearance.GetAttachedAsset(p);
3846 3850
@@ -3866,9 +3870,7 @@ namespace OpenSim.Region.Framework.Scenes
3866 { 3870 {
3867 m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}", e.ToString()); 3871 m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}", e.ToString());
3868 } 3872 }
3869
3870 } 3873 }
3871
3872 } 3874 }
3873 } 3875 }
3874} 3876}