Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-05-10 00:42:10 +01:00
24 changed files with 114 additions and 11 deletions

View File

@@ -320,7 +320,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_HostCapsObj.HttpListener.AddStreamHandler(
new BinaryStreamHandler(
"POST", capsBase + uploaderPath, uploader.uploaderCaps, "BunchOfCaps", null));
"POST", capsBase + uploaderPath, uploader.uploaderCaps, "TaskInventoryScriptUpdater", null));
string protocol = "http://";