diff options
author | Diva Canto | 2010-01-12 09:22:58 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-12 09:22:58 -0800 |
commit | 66920a9047b54db947d02f252e17409b7fc32ef0 (patch) | |
tree | 8e5b34a510885183e400796616f224faceb4a142 /OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |
parent | Fixed a couple of bugs with Appearance. Appearance is all good now. (diff) | |
download | opensim-SC-66920a9047b54db947d02f252e17409b7fc32ef0.zip opensim-SC-66920a9047b54db947d02f252e17409b7fc32ef0.tar.gz opensim-SC-66920a9047b54db947d02f252e17409b7fc32ef0.tar.bz2 opensim-SC-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/Services/Connectors/Simulation/SimulationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 76558aa..bd72570 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -210,12 +210,12 @@ namespace OpenSim.Services.Connectors.Simulation | |||
210 | 210 | ||
211 | public bool UpdateAgent(GridRegion destination, AgentData data) | 211 | public bool UpdateAgent(GridRegion destination, AgentData data) |
212 | { | 212 | { |
213 | return UpdateAgent(destination, data); | 213 | return UpdateAgent(destination, (IAgentData)data); |
214 | } | 214 | } |
215 | 215 | ||
216 | public bool UpdateAgent(GridRegion destination, AgentPosition data) | 216 | public bool UpdateAgent(GridRegion destination, AgentPosition data) |
217 | { | 217 | { |
218 | return UpdateAgent(destination, data); | 218 | return UpdateAgent(destination, (IAgentData)data); |
219 | } | 219 | } |
220 | 220 | ||
221 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) | 221 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) |
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
231 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); | 231 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); |
232 | return false; | 232 | return false; |
233 | } | 233 | } |
234 | //Console.WriteLine(" >>> DoChildAgentUpdateCall <<< " + uri); | 234 | Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); |
235 | 235 | ||
236 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); | 236 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); |
237 | ChildUpdateRequest.Method = "PUT"; | 237 | ChildUpdateRequest.Method = "PUT"; |
@@ -276,12 +276,12 @@ namespace OpenSim.Services.Connectors.Simulation | |||
276 | ChildUpdateRequest.ContentLength = buffer.Length; //Count bytes to send | 276 | ChildUpdateRequest.ContentLength = buffer.Length; //Count bytes to send |
277 | os = ChildUpdateRequest.GetRequestStream(); | 277 | os = ChildUpdateRequest.GetRequestStream(); |
278 | os.Write(buffer, 0, strBuffer.Length); //Send it | 278 | os.Write(buffer, 0, strBuffer.Length); //Send it |
279 | //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted ChildAgentUpdate request to remote sim {0}", uri); | 279 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted AgentUpdate request to remote sim {0}", uri); |
280 | } | 280 | } |
281 | //catch (WebException ex) | 281 | catch (WebException ex) |
282 | catch | 282 | //catch |
283 | { | 283 | { |
284 | //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on ChildAgentUpdate {0}", ex.Message); | 284 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on AgentUpdate {0}", ex.Message); |
285 | 285 | ||
286 | return false; | 286 | return false; |
287 | } | 287 | } |