Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Dan Lake 2012-05-10 14:43:02 -0700
committer: Dan Lake 2012-05-10 14:43:02 -0700
commit: 117c183fde5c21bd87c99cb0af4c1903550570e9 (patch)
tree: d109468b072ec15d8a6afee384185aab3439b056 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
parent: Add even for terrain tainting and synchronize terrain module with physics sce... (diff)
parent: Saving estate state is really slow (relatively) and it gets (diff)
download: opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.zip
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.gz
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.bz2
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.xz
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 9791885..6c28e78 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -309,7 +309,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://";
author	Dan Lake	2012-05-10 14:43:02 -0700
committer	Dan Lake	2012-05-10 14:43:02 -0700
commit	117c183fde5c21bd87c99cb0af4c1903550570e9 (patch)
tree	d109468b072ec15d8a6afee384185aab3439b056 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
parent	Add even for terrain tainting and synchronize terrain module with physics sce... (diff)
parent	Saving estate state is really slow (relatively) and it gets (diff)
download	opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.zip opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.gz opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.bz2 opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 9791885..6c28e78 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ClientStack.Linden
309		309
310	m_HostCapsObj.HttpListener.AddStreamHandler(	310	m_HostCapsObj.HttpListener.AddStreamHandler(
311	new BinaryStreamHandler(	311	new BinaryStreamHandler(
312	"POST", capsBase + uploaderPath, uploader.uploaderCaps, "BunchOfCaps", null));	312	"POST", capsBase + uploaderPath, uploader.uploaderCaps, "TaskInventoryScriptUpdater", null));
313		313
314	string protocol = "http://";	314	string protocol = "http://";
315		315