diff options
| author | Melanie | 2012-05-10 00:42:10 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-10 00:42:10 +0100 |
| commit | a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a (patch) | |
| tree | e14d17475f8dcf643f4153f882f92e89b869a686 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the... (diff) | |
| download | opensim-SC-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.zip opensim-SC-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.tar.gz opensim-SC-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.tar.bz2 opensim-SC-a90822f4b8ce8b10f8d38e09adf45a1e8e4ed86a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index f14beb0..d397893 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -320,7 +320,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 320 | 320 | ||
| 321 | m_HostCapsObj.HttpListener.AddStreamHandler( | 321 | m_HostCapsObj.HttpListener.AddStreamHandler( |
| 322 | new BinaryStreamHandler( | 322 | new BinaryStreamHandler( |
| 323 | "POST", capsBase + uploaderPath, uploader.uploaderCaps, "BunchOfCaps", null)); | 323 | "POST", capsBase + uploaderPath, uploader.uploaderCaps, "TaskInventoryScriptUpdater", null)); |
| 324 | 324 | ||
| 325 | string protocol = "http://"; | 325 | string protocol = "http://"; |
| 326 | 326 | ||