aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 05:43:02 +0000
committerJeff Ames2007-12-20 05:43:02 +0000
commitbe2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch)
tree688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Region/Communications/OGS1
parent*Added event called after any movement is handled (OnClientMovement) - will b... (diff)
downloadopensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
3 files changed, 5 insertions, 5 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);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 709a227..6c1f77e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1
63 { 63 {
64 try 64 try
65 { 65 {
66 Console.WriteLine("Requesting Inventory from Inventory server ( " + _inventoryServerUrl + "/GetInventory/" +" ) for " + userID.ToStringHyphenated()); 66 Console.WriteLine("Requesting Inventory from Inventory server ( " + _inventoryServerUrl + "/GetInventory/" +" ) for " + userID.ToString());
67 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>(); 67 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>();
68 requester.ResponseCallback = InventoryResponse; 68 requester.ResponseCallback = InventoryResponse;
69 69
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index d26da90..c1e6ba6 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Communications.OGS1
118 try 118 try
119 { 119 {
120 Hashtable param = new Hashtable(); 120 Hashtable param = new Hashtable();
121 param["queryid"] = (string)queryID.ToStringHyphenated(); 121 param["queryid"] = (string)queryID.ToString();
122 param["avquery"] = objAlphaNumericPattern.Replace(query, ""); 122 param["avquery"] = objAlphaNumericPattern.Replace(query, "");
123 IList parameters = new ArrayList(); 123 IList parameters = new ArrayList();
124 parameters.Add(param); 124 parameters.Add(param);