OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Added ServiceURLs to AgentCircuitData. 

* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
slimupdates
Diva Canto 2010-01-17 08:40:05 -08:00
parent bd4d94a4f5
commit a7309d90da
6 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Framework/AgentCircuitData.cs
View File

@ -101,6 +101,8 @@ namespace OpenSim.Framework
/// </summary>
public Vector3 startpos;
public Dictionary<string, object> ServiceURLs;
public AgentCircuitData()
{
}
@ -187,6 +189,16 @@ namespace OpenSim.Framework
}
}
if (ServiceURLs != null && ServiceURLs.Count > 0)
{
OSDArray urls = new OSDArray(ServiceURLs.Count * 2);
foreach (KeyValuePair<string, object> kvp in ServiceURLs)
{
urls.Add(OSD.FromString(kvp.Key));
urls.Add(OSD.FromString((kvp.Value == null) ? string.Empty : kvp.Value.ToString()));
}
}
return args;
}
@ -270,6 +282,15 @@ namespace OpenSim.Framework
Appearance.SetAttachments(attachments);
}
ServiceURLs = new Dictionary<string, object>();
if (args.ContainsKey("service_urls") && args["service_urls"] != null && (args["service_urls"]).Type == OSDType.Array)
{
OSDArray urls = (OSDArray)(args["service_urls"]);
for (int i = 0; i < urls.Count / 2; i++)
{
ServiceURLs[urls[i * 2].AsString()] = urls[(i * 2) + 1].AsString();
}
}
}
}

2
OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
View File

@ -86,8 +86,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
//string portstr = (string)requestData["port"];
string name = (string)requestData["region_name"];
m_log.DebugFormat("[HGrid]: Hyperlink request");
UUID regionID = UUID.Zero;
string imageURL = string.Empty;
ulong regionHandle = 0;

2
OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
m_log.Debug("[HGrid]: Linking to " + uri);
//m_log.Debug("[HGrid]: Linking to " + uri);
XmlRpcResponse response = null;
try
{

1
OpenSim/Services/HypergridService/HGCommands.cs
View File

@ -159,6 +159,7 @@ namespace OpenSim.Services.HypergridService
string reason = string.Empty;
if (m_HypergridService.TryLinkRegionToCoords(mapName, xloc, yloc, out reason) == null)
MainConsole.Instance.Output("Failed to link region: " + reason);
MainConsole.Instance.Output("Hyperlink estalished");
}
else
{

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

@ -438,6 +438,7 @@ namespace OpenSim.Services.LLLoginService
aCircuit.SecureSessionID = secureSession;
aCircuit.SessionID = session;
aCircuit.startpos = position;
aCircuit.ServiceURLs = account.ServiceURLs;
if (simConnector.CreateAgent(region, aCircuit, 0, out reason))
return aCircuit;

2
bin/config-include/StandaloneHypergrid.ini
View File

@ -69,7 +69,7 @@
Realm = "regions"
[HypergridService]
GridService = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
GridService = "OpenSim.Services.GridService.dll:GridService"
AssetService = "OpenSim.Services.AssetService.dll:AssetService"
[GatekeeperService]