Merge branch 'master' into httptests

author: UbitUmarov 2017-05-31 07:21:21 +0100
committer: UbitUmarov 2017-05-31 07:21:21 +0100
commit: 55babdc16090397499081f0428500babe383ff3a (patch)
tree: efb2f7ec13abba489d6318ebace8a86c6cde66c6 /OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
parent: disable llhttprequests secure con, since it still collides with main ssl sett... (diff)
parent: we don't need to keep refs to baked textures assets (diff)
download: opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip
opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz
opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2
opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
index 10ea8ee..fd484ba 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Capabilities.Handlers
            server.AddStreamHandler(new RestStreamHandler(
                        "POST",
                        "/CAPS/UploadBakedTexture/",
-                        new UploadBakedTextureHandler(caps, m_AssetService, true).UploadBakedTexture,
+                        new UploadBakedTextureHandler(caps, m_AssetService).UploadBakedTexture,
                        "UploadBakedTexture",
                        "Upload Baked Texture Capability"));
author	UbitUmarov	2017-05-31 07:21:21 +0100
committer	UbitUmarov	2017-05-31 07:21:21 +0100
commit	55babdc16090397499081f0428500babe383ff3a (patch)
tree	efb2f7ec13abba489d6318ebace8a86c6cde66c6 /OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
parent	disable llhttprequests secure con, since it still collides with main ssl sett... (diff)
parent	we don't need to keep refs to baked textures assets (diff)
download	opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2 opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz

diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs index 10ea8ee..fd484ba 100644 --- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Capabilities.Handlers
67	server.AddStreamHandler(new RestStreamHandler(	67	server.AddStreamHandler(new RestStreamHandler(
68	"POST",	68	"POST",
69	"/CAPS/UploadBakedTexture/",	69	"/CAPS/UploadBakedTexture/",
70	new UploadBakedTextureHandler(caps, m_AssetService, true).UploadBakedTexture,	70	new UploadBakedTextureHandler(caps, m_AssetService).UploadBakedTexture,
71	"UploadBakedTexture",	71	"UploadBakedTexture",
72	"Upload Baked Texture Capability"));	72	"Upload Baked Texture Capability"));
73		73