Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

author: Melanie 2011-12-08 03:37:48 +0100
committer: Melanie 2011-12-08 03:37:48 +0100
commit: 7c7dd6269a0efff5b4619028825a46fcab84de63 (patch)
tree: cbe6c622fc1c069f3a33636fd1174d314dec074a /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
parent: Recover from an internal mess-up in the outgoing packet queues by creating (diff)
parent: Merge branch 'master' into bigmerge (diff)
download: opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.zip
opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.gz
opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.bz2
opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index e61815f..45d6071 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.ClientStack.Linden
                "UploadBakedTexture",
                new RestStreamHandler(
                    "POST",
-                    "/CAPS/" + m_uploadBakedTexturePath,
+                    "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
                    new UploadBakedTextureHandler(
                        caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture));
        }
author	Melanie	2011-12-08 03:37:48 +0100
committer	Melanie	2011-12-08 03:37:48 +0100
commit	7c7dd6269a0efff5b4619028825a46fcab84de63 (patch)
tree	cbe6c622fc1c069f3a33636fd1174d314dec074a /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
parent	Recover from an internal mess-up in the outgoing packet queues by creating (diff)
parent	Merge branch 'master' into bigmerge (diff)
download	opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.zip opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.gz opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.bz2 opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs index e61815f..45d6071 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.ClientStack.Linden
104	"UploadBakedTexture",	104	"UploadBakedTexture",
105	new RestStreamHandler(	105	new RestStreamHandler(
106	"POST",	106	"POST",
107	"/CAPS/" + m_uploadBakedTexturePath,	107	"/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
108	new UploadBakedTextureHandler(	108	new UploadBakedTextureHandler(
109	caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture));	109	caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture));
110	}	110	}