ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.

Browse Source
This commit is contained in:
Diva Canto
2010-01-12 09:22:58 -08:00
parent 77e43f4801
commit 66920a9047
12 changed files with 102 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@@ -210,12 +210,12 @@ namespace OpenSim.Services.Connectors.Simulation
public bool UpdateAgent(GridRegion destination, AgentData data)
{
return UpdateAgent(destination, data);
return UpdateAgent(destination, (IAgentData)data);
}
public bool UpdateAgent(GridRegion destination, AgentPosition data)
{
return UpdateAgent(destination, data);
return UpdateAgent(destination, (IAgentData)data);
}
private bool UpdateAgent(GridRegion destination, IAgentData cAgentData)
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Simulation
m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message);
return false;
}
//Console.WriteLine(" >>> DoChildAgentUpdateCall <<< " + uri);
Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri);
HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri);
ChildUpdateRequest.Method = "PUT";
@@ -276,12 +276,12 @@ namespace OpenSim.Services.Connectors.Simulation
ChildUpdateRequest.ContentLength = buffer.Length; //Count bytes to send
os = ChildUpdateRequest.GetRequestStream();
os.Write(buffer, 0, strBuffer.Length); //Send it
//m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted ChildAgentUpdate request to remote sim {0}", uri);
m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted AgentUpdate request to remote sim {0}", uri);
}
//catch (WebException ex)
catch
catch (WebException ex)
//catch
{
//m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on ChildAgentUpdate {0}", ex.Message);
m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on AgentUpdate {0}", ex.Message);
return false;
}

2
OpenSim/Services/Interfaces/IAvatarService.cs
View File

@@ -123,7 +123,7 @@ namespace OpenSim.Services.Interfaces
if (_kvp.Value != null)
result[_kvp.Key] = _kvp.Value;
}
return null;
return result;
}
public AvatarData(AvatarAppearance appearance)

1
OpenSim/Services/InventoryService/InventoryService.cs
View File

@@ -298,6 +298,7 @@ namespace OpenSim.Services.InventoryService
if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
folders[(AssetType)folder.Type] = folder;
}
m_log.DebugFormat("[INVENTORY SERVICE]: Got {0} system folders for {1}", folders.Count, userID);
return folders;
}
}