diff options
author | Melanie | 2013-07-18 10:17:30 +0100 |
---|---|---|
committer | Melanie | 2013-07-18 10:17:30 +0100 |
commit | 437326a4800f23c23abd65b2a44dc21e33f6b1c5 (patch) | |
tree | 85aee59a2d83ce991064ba663b521d3ef929f1bf /OpenSim/Region/ClientStack/Linden/Caps | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.zip opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.gz opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.bz2 opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.xz |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs index 674b451..cf95463 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |||
@@ -287,14 +287,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
287 | 287 | ||
288 | public void RegisterCaps(UUID agentID, Caps caps) | 288 | public void RegisterCaps(UUID agentID, Caps caps) |
289 | { | 289 | { |
290 | UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler( | ||
291 | caps, m_scene.AssetService, m_persistBakedTextures); | ||
292 | |||
293 | UUID capID = UUID.Random(); | 290 | UUID capID = UUID.Random(); |
294 | 291 | ||
295 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 292 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); |
296 | if (m_URL == "localhost") | 293 | if (m_URL == "localhost") |
297 | { | 294 | { |
295 | UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler( | ||
296 | caps, m_scene.AssetService, m_persistBakedTextures); | ||
297 | |||
298 | caps.RegisterHandler( | 298 | caps.RegisterHandler( |
299 | "UploadBakedTexture", | 299 | "UploadBakedTexture", |
300 | new RestStreamHandler( | 300 | new RestStreamHandler( |
@@ -309,7 +309,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
309 | { | 309 | { |
310 | caps.RegisterHandler("UploadBakedTexture", m_URL); | 310 | caps.RegisterHandler("UploadBakedTexture", m_URL); |
311 | } | 311 | } |
312 | |||
313 | } | 312 | } |
314 | } | 313 | } |
315 | } | 314 | } |