aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2010-01-12 09:22:58 -0800
committerDiva Canto2010-01-12 09:22:58 -0800
commit66920a9047b54db947d02f252e17409b7fc32ef0 (patch)
tree8e5b34a510885183e400796616f224faceb4a142 /OpenSim/Region
parentFixed a couple of bugs with Appearance. Appearance is all good now. (diff)
downloadopensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.zip
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.gz
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.bz2
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.xz
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs8
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
4 files changed, 10 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index f20a2a9..aa3b30d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -337,15 +337,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
337 337
338 private UUID GetSessionID(UUID userID) 338 private UUID GetSessionID(UUID userID)
339 { 339 {
340 ScenePresence sp = null;
341 if (m_Scene.TryGetAvatar(userID, out sp))
342 {
343 return sp.ControllingClient.SessionId;
344 }
345
346 m_log.DebugFormat("[INVENTORY CONNECTOR]: scene presence for {0} not found", userID);
347 return UUID.Zero; 340 return UUID.Zero;
348
349 } 341 }
350 342
351 } 343 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index c6c6af0..723973c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -172,12 +172,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
172 { 172 {
173 if (s.RegionInfo.RegionHandle == destination.RegionHandle) 173 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
174 { 174 {
175 m_log.DebugFormat("[LOCAL COMMS]: Found region {0} to send SendCreateChildAgent", destination.RegionName); 175 m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName);
176 return s.NewUserConnection(aCircuit, teleportFlags, out reason); 176 return s.NewUserConnection(aCircuit, teleportFlags, out reason);
177 } 177 }
178 } 178 }
179 179
180 m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", destination.RegionName); 180 m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCreateChildAgent", destination.RegionName);
181 reason = "Did not find region " + destination.RegionName; 181 reason = "Did not find region " + destination.RegionName;
182 return false; 182 return false;
183 } 183 }
@@ -191,9 +191,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
191 { 191 {
192 if (s.RegionInfo.RegionHandle == destination.RegionHandle) 192 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
193 { 193 {
194 //m_log.DebugFormat( 194 m_log.DebugFormat(
195 // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate", 195 "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
196 // s.RegionInfo.RegionName, regionHandle); 196 s.RegionInfo.RegionName, destination.RegionHandle);
197 197
198 s.IncomingChildAgentDataUpdate(cAgentData); 198 s.IncomingChildAgentDataUpdate(cAgentData);
199 return true; 199 return true;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index db7b3ff..6c8068c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3708,8 +3708,8 @@ namespace OpenSim.Region.Framework.Scenes
3708 /// <returns>true if we handled it.</returns> 3708 /// <returns>true if we handled it.</returns>
3709 public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) 3709 public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)
3710 { 3710 {
3711// m_log.DebugFormat( 3711 m_log.DebugFormat(
3712// "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); 3712 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
3713 3713
3714 // We have to wait until the viewer contacts this region after receiving EAC. 3714 // We have to wait until the viewer contacts this region after receiving EAC.
3715 // That calls AddNewClient, which finally creates the ScenePresence 3715 // That calls AddNewClient, which finally creates the ScenePresence
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ae586a1..c7a457e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2575,9 +2575,9 @@ namespace OpenSim.Region.Framework.Scenes
2575 if (m_appearance.AvatarHeight > 0) 2575 if (m_appearance.AvatarHeight > 0)
2576 SetHeight(m_appearance.AvatarHeight); 2576 SetHeight(m_appearance.AvatarHeight);
2577 2577
2578 AvatarData adata = new AvatarData(m_appearance); 2578 // This is not needed, because only the transient data changed
2579 2579 //AvatarData adata = new AvatarData(m_appearance);
2580 m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata); 2580 //m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
2581 2581
2582 SendAppearanceToAllOtherAgents(); 2582 SendAppearanceToAllOtherAgents();
2583 if (!m_startAnimationSet) 2583 if (!m_startAnimationSet)