aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs13
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs6
2 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 504ca8b..e44a301 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -377,7 +377,7 @@ namespace OpenSim.Framework.Servers
377 377
378 Hashtable keysvals = new Hashtable(); 378 Hashtable keysvals = new Hashtable();
379 Hashtable headervals = new Hashtable(); 379 Hashtable headervals = new Hashtable();
380 string host = String.Empty; 380 //string host = String.Empty;
381 381
382 string[] querystringkeys = request.QueryString.AllKeys; 382 string[] querystringkeys = request.QueryString.AllKeys;
383 string[] rHeaders = request.Headers.AllKeys; 383 string[] rHeaders = request.Headers.AllKeys;
@@ -394,15 +394,16 @@ namespace OpenSim.Framework.Servers
394 headervals[headername] = request.Headers[headername]; 394 headervals[headername] = request.Headers[headername];
395 } 395 }
396 396
397 if (headervals.Contains("Host")) 397// if (headervals.Contains("Host"))
398 { 398// {
399 host = (string)headervals["Host"]; 399// host = (string)headervals["Host"];
400 } 400// }
401
401 keysvals.Add("requestbody",requestBody); 402 keysvals.Add("requestbody",requestBody);
402 if (keysvals.Contains("method")) 403 if (keysvals.Contains("method"))
403 { 404 {
404 //m_log.Warn("[HTTP]: Contains Method"); 405 //m_log.Warn("[HTTP]: Contains Method");
405 string method = (string)keysvals["method"]; 406 //string method = (string)keysvals["method"];
406 //m_log.Warn("[HTTP]: " + requestBody); 407 //m_log.Warn("[HTTP]: " + requestBody);
407 408
408 } 409 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index f2f8cd2..91763a7 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
56 56
57 public InventoryArchiveReadRequest(Scene currentScene, CommunicationsManager commsManager) 57 public InventoryArchiveReadRequest(Scene currentScene, CommunicationsManager commsManager)
58 { 58 {
59 List<string> serialisedObjects = new List<string>(); 59 //List<string> serialisedObjects = new List<string>();
60 scene = currentScene; 60 scene = currentScene;
61 this.commsManager = commsManager; 61 this.commsManager = commsManager;
62 } 62 }
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
150 150
151 string firstName = cmdparams[0]; 151 string firstName = cmdparams[0];
152 string lastName = cmdparams[1]; 152 string lastName = cmdparams[1];
153 string invPath = cmdparams[2]; 153 //string invPath = cmdparams[2];
154 loadPath = (cmdparams.Length > 3 ? cmdparams[3] : "inventory.tar.gz"); 154 loadPath = (cmdparams.Length > 3 ? cmdparams[3] : "inventory.tar.gz");
155 155
156 archive 156 archive
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
192 /// <returns>true if asset was successfully loaded, false otherwise</returns> 192 /// <returns>true if asset was successfully loaded, false otherwise</returns>
193 private bool LoadAsset(string assetPath, byte[] data) 193 private bool LoadAsset(string assetPath, byte[] data)
194 { 194 {
195 IRegionSerialiser serialiser = scene.RequestModuleInterface<IRegionSerialiser>(); 195 //IRegionSerialiser serialiser = scene.RequestModuleInterface<IRegionSerialiser>();
196 // Right now we're nastily obtaining the UUID from the filename 196 // Right now we're nastily obtaining the UUID from the filename
197 string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); 197 string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length);
198 int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR); 198 int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR);