diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 073457b..78e3a83 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -505,7 +505,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
505 | get { return m_knownChildRegions; } | 505 | get { return m_knownChildRegions; } |
506 | set | 506 | set |
507 | { | 507 | { |
508 | //Console.WriteLine(" !! Setting known regions in {0} to {1}", Scene.RegionInfo.RegionName, value.Count); | ||
509 | m_knownChildRegions = value; | 508 | m_knownChildRegions = value; |
510 | } | 509 | } |
511 | } | 510 | } |
@@ -587,8 +586,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
587 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); | 586 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); |
588 | if (userInfo != null) | 587 | if (userInfo != null) |
589 | userInfo.OnItemReceived += ItemReceived; | 588 | userInfo.OnItemReceived += ItemReceived; |
590 | |||
591 | m_log.Info("[AVATAR]: New ScenePresence in " + Scene.RegionInfo.RegionName); | ||
592 | } | 589 | } |
593 | 590 | ||
594 | public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, | 591 | public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams, |
@@ -803,7 +800,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
803 | "[SCENE]: Upgrading child to root agent for {0} in {1}", | 800 | "[SCENE]: Upgrading child to root agent for {0} in {1}", |
804 | Name, m_scene.RegionInfo.RegionName); | 801 | Name, m_scene.RegionInfo.RegionName); |
805 | 802 | ||
806 | m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); | 803 | //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); |
807 | 804 | ||
808 | IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); | 805 | IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); |
809 | if (gm != null) | 806 | if (gm != null) |
@@ -2172,9 +2169,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2172 | /// </summary> | 2169 | /// </summary> |
2173 | /// <param name="client"></param> | 2170 | /// <param name="client"></param> |
2174 | public void SendWearables() | 2171 | public void SendWearables() |
2175 | { | 2172 | { |
2176 | m_log.DebugFormat("[APPEARANCE]: Sending wearables to {0}", Name); | ||
2177 | |||
2178 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 2173 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
2179 | } | 2174 | } |
2180 | 2175 | ||
@@ -2183,8 +2178,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2183 | /// </summary> | 2178 | /// </summary> |
2184 | public void SendAppearanceToAllOtherAgents() | 2179 | public void SendAppearanceToAllOtherAgents() |
2185 | { | 2180 | { |
2186 | m_log.DebugFormat("[APPEARANCE]: Sending appearance to all other agents for {0}", Name); | ||
2187 | |||
2188 | m_perfMonMS = System.Environment.TickCount; | 2181 | m_perfMonMS = System.Environment.TickCount; |
2189 | 2182 | ||
2190 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 2183 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
@@ -2215,8 +2208,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2215 | /// <param name="visualParam"></param> | 2208 | /// <param name="visualParam"></param> |
2216 | public void SetAppearance(byte[] texture, List<byte> visualParam) | 2209 | public void SetAppearance(byte[] texture, List<byte> visualParam) |
2217 | { | 2210 | { |
2218 | m_log.DebugFormat("[APPEARANCE]: Receiving appearance for {0}", Name); | ||
2219 | |||
2220 | m_appearance.SetAppearance(texture, visualParam); | 2211 | m_appearance.SetAppearance(texture, visualParam); |
2221 | SetHeight(m_appearance.AvatarHeight); | 2212 | SetHeight(m_appearance.AvatarHeight); |
2222 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); | 2213 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); |
@@ -2232,8 +2223,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2232 | 2223 | ||
2233 | public void SetWearable(int wearableId, AvatarWearable wearable) | 2224 | public void SetWearable(int wearableId, AvatarWearable wearable) |
2234 | { | 2225 | { |
2235 | m_log.DebugFormat("[APPEARANCE]: Setting wearable for {0}", Name); | ||
2236 | |||
2237 | m_appearance.SetWearable(wearableId, wearable); | 2226 | m_appearance.SetWearable(wearableId, wearable); |
2238 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); | 2227 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); |
2239 | m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 2228 | m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
@@ -2466,8 +2455,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2466 | 2455 | ||
2467 | IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); | 2456 | IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); |
2468 | if (eq != null) | 2457 | if (eq != null) |
2469 | { | 2458 | { |
2470 | |||
2471 | OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, | 2459 | OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, |
2472 | capsPath, UUID, ControllingClient.SessionId); | 2460 | capsPath, UUID, ControllingClient.SessionId); |
2473 | eq.Enqueue(Item, UUID); | 2461 | eq.Enqueue(Item, UUID); |