aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2009-03-28 01:40:33 +0000
committerTeravus Ovares2009-03-28 01:40:33 +0000
commitf5812b3702f38d4535f042303eef4bd37f8a448c (patch)
tree01a5a1565d97ce02e5910b153cbfe71f86fd3926 /OpenSim/Region/Framework
parentSmall bugs fixed related to ownership and permissions. (diff)
downloadopensim-SC-f5812b3702f38d4535f042303eef4bd37f8a448c.zip
opensim-SC-f5812b3702f38d4535f042303eef4bd37f8a448c.tar.gz
opensim-SC-f5812b3702f38d4535f042303eef4bd37f8a448c.tar.bz2
opensim-SC-f5812b3702f38d4535f042303eef4bd37f8a448c.tar.xz
* Adds AgentUUIDs into the CourseLocationUpdate to improve compatibility with LibOMV based clients.
* Modifies the IClientAPI! So client stacks will need to be modified!
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 42820c4..b059624 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2178,6 +2178,7 @@ namespace OpenSim.Region.Framework.Scenes
2178 m_perfMonMS = System.Environment.TickCount; 2178 m_perfMonMS = System.Environment.TickCount;
2179 2179
2180 List<Vector3> CoarseLocations = new List<Vector3>(); 2180 List<Vector3> CoarseLocations = new List<Vector3>();
2181 List<UUID> AvatarUUIDs = new List<UUID>();
2181 List<ScenePresence> avatars = m_scene.GetAvatars(); 2182 List<ScenePresence> avatars = m_scene.GetAvatars();
2182 for (int i = 0; i < avatars.Count; i++) 2183 for (int i = 0; i < avatars.Count; i++)
2183 { 2184 {
@@ -2190,21 +2191,24 @@ namespace OpenSim.Region.Framework.Scenes
2190 if (sop != null) 2191 if (sop != null)
2191 { 2192 {
2192 CoarseLocations.Add(sop.AbsolutePosition + avatars[i].m_pos); 2193 CoarseLocations.Add(sop.AbsolutePosition + avatars[i].m_pos);
2194 AvatarUUIDs.Add(avatars[i].UUID);
2193 } 2195 }
2194 else 2196 else
2195 { 2197 {
2196 // we can't find the parent.. ! arg! 2198 // we can't find the parent.. ! arg!
2197 CoarseLocations.Add(avatars[i].m_pos); 2199 CoarseLocations.Add(avatars[i].m_pos);
2200 AvatarUUIDs.Add(avatars[i].UUID);
2198 } 2201 }
2199 } 2202 }
2200 else 2203 else
2201 { 2204 {
2202 CoarseLocations.Add(avatars[i].m_pos); 2205 CoarseLocations.Add(avatars[i].m_pos);
2206 AvatarUUIDs.Add(avatars[i].UUID);
2203 } 2207 }
2204 } 2208 }
2205 } 2209 }
2206 2210
2207 m_controllingClient.SendCoarseLocationUpdate(CoarseLocations); 2211 m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations);
2208 2212
2209 m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); 2213 m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS);
2210 } 2214 }