Merge branch 'master' of /home/opensim/var/repo/opensim

author: BlueWall 2011-12-07 07:52:24 -0500
committer: BlueWall 2011-12-07 07:52:24 -0500
commit: 6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch)
tree: 6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
parent: Merge branch 'master' of /home/opensim/var/repo/opensim (diff)
parent: Stop accidentally setting up the UploadTexture caps handler with the same url... (diff)
download: opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.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	BlueWall	2011-12-07 07:52:24 -0500
committer	BlueWall	2011-12-07 07:52:24 -0500
commit	6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch)
tree	6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
parent	Merge branch 'master' of /home/opensim/var/repo/opensim (diff)
parent	Stop accidentally setting up the UploadTexture caps handler with the same url... (diff)
download	opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2 opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.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	}