diff options
author | Jeff Ames | 2007-12-20 05:43:02 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-20 05:43:02 +0000 |
commit | be2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch) | |
tree | 688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |
parent | *Added event called after any movement is handled (OnClientMovement) - will b... (diff) | |
download | opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2 opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz |
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index fbb83fc..060fe28 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
103 | // Login / Authentication | 103 | // Login / Authentication |
104 | 104 | ||
105 | GridParams["authkey"] = serversInfo.GridSendKey; | 105 | GridParams["authkey"] = serversInfo.GridSendKey; |
106 | GridParams["UUID"] = regionInfo.RegionID.ToStringHyphenated(); | 106 | GridParams["UUID"] = regionInfo.RegionID.ToString(); |
107 | GridParams["sim_ip"] = regionInfo.ExternalHostName; | 107 | GridParams["sim_ip"] = regionInfo.ExternalHostName; |
108 | GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString(); | 108 | GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString(); |
109 | GridParams["region_locx"] = regionInfo.RegionLocX.ToString(); | 109 | GridParams["region_locx"] = regionInfo.RegionLocX.ToString(); |
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
111 | GridParams["sim_name"] = regionInfo.RegionName; | 111 | GridParams["sim_name"] = regionInfo.RegionName; |
112 | GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); | 112 | GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); |
113 | GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); | 113 | GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); |
114 | GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToStringHyphenated(); | 114 | GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString(); |
115 | 115 | ||
116 | // Package into an XMLRPC Request | 116 | // Package into an XMLRPC Request |
117 | ArrayList SendParams = new ArrayList(); | 117 | ArrayList SendParams = new ArrayList(); |
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
191 | { | 191 | { |
192 | RegionInfo regionInfo; | 192 | RegionInfo regionInfo; |
193 | Hashtable requestData = new Hashtable(); | 193 | Hashtable requestData = new Hashtable(); |
194 | requestData["region_UUID"] = Region_UUID.ToStringHyphenated(); | 194 | requestData["region_UUID"] = Region_UUID.ToString(); |
195 | requestData["authkey"] = serversInfo.GridSendKey; | 195 | requestData["authkey"] = serversInfo.GridSendKey; |
196 | ArrayList SendParams = new ArrayList(); | 196 | ArrayList SendParams = new ArrayList(); |
197 | SendParams.Add(requestData); | 197 | SendParams.Add(requestData); |