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

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-10-21 07:33:01 +01:00
parent 8853c21763 1f7577b735
commit fc33d569cd
31 changed files with 581 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Services/Connectors/Land/LandServiceConnector.cs
View File

@@ -84,10 +84,7 @@ namespace OpenSim.Services.Connectors
if (info != null) // just to be sure
{
XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
//Possible nullref from info.externalendpoint will be caught here
string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
XmlRpcResponse response = request.Send(uri, 10000);
XmlRpcResponse response = request.Send(info.ServerURI, 10000);
if (response.IsFault)
{
m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString);
@@ -134,4 +131,4 @@ namespace OpenSim.Services.Connectors
return landData;
}
}
}
}