diff options
| author | Melanie | 2010-10-21 07:33:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 07:33:01 +0100 |
| commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
| tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /OpenSim/Services/Connectors/Land | |
| parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
| parent | Skip empty strings in ParseString* functions (diff) | |
| download | opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC_OLD-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Land')
| -rw-r--r-- | OpenSim/Services/Connectors/Land/LandServiceConnector.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 8f74335..10499e2 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
| @@ -84,10 +84,7 @@ namespace OpenSim.Services.Connectors | |||
| 84 | if (info != null) // just to be sure | 84 | if (info != null) // just to be sure |
| 85 | { | 85 | { |
| 86 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); | 86 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); |
| 87 | 87 | XmlRpcResponse response = request.Send(info.ServerURI, 10000); | |
| 88 | //Possible nullref from info.externalendpoint will be caught here | ||
| 89 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; | ||
| 90 | XmlRpcResponse response = request.Send(uri, 10000); | ||
| 91 | if (response.IsFault) | 88 | if (response.IsFault) |
| 92 | { | 89 | { |
| 93 | m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString); | 90 | m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString); |
| @@ -134,4 +131,4 @@ namespace OpenSim.Services.Connectors | |||
| 134 | return landData; | 131 | return landData; |
| 135 | } | 132 | } |
| 136 | } | 133 | } |
| 137 | } \ No newline at end of file | 134 | } |