aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
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/Services
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/Services')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs14
-rw-r--r--OpenSim/Services/Interfaces/IAvatarService.cs2
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs1
3 files changed, 9 insertions, 8 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 }
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 564c406..de3bcf9 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Services.Interfaces
123 if (_kvp.Value != null) 123 if (_kvp.Value != null)
124 result[_kvp.Key] = _kvp.Value; 124 result[_kvp.Key] = _kvp.Value;
125 } 125 }
126 return null; 126 return result;
127 } 127 }
128 128
129 public AvatarData(AvatarAppearance appearance) 129 public AvatarData(AvatarAppearance appearance)
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 95007f1..781b89b 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -298,6 +298,7 @@ namespace OpenSim.Services.InventoryService
298 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown)) 298 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
299 folders[(AssetType)folder.Type] = folder; 299 folders[(AssetType)folder.Type] = folder;
300 } 300 }
301 m_log.DebugFormat("[INVENTORY SERVICE]: Got {0} system folders for {1}", folders.Count, userID);
301 return folders; 302 return folders;
302 } 303 }
303 } 304 }