aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
diff options
context:
space:
mode:
authorBlueWall2011-12-07 07:52:24 -0500
committerBlueWall2011-12-07 07:52:24 -0500
commit6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch)
tree6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
parentStop accidentally setting up the UploadTexture caps handler with the same url... (diff)
downloadopensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs')
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 899f9c0..9d6f964 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Server.Handlers.Asset
88 } 88 }
89 89
90 public override byte[] Handle(string path, Stream requestData, 90 public override byte[] Handle(string path, Stream requestData,
91 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 91 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
92 { 92 {
93 StreamReader sr = new StreamReader(requestData); 93 StreamReader sr = new StreamReader(requestData);
94 string body = sr.ReadToEnd(); 94 string body = sr.ReadToEnd();