diff options
| author | Justin Clark-Casey (justincc) | 2011-12-06 21:42:56 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-12-06 21:42:56 +0000 |
| commit | 8e542cfa03f9368368a0f73fbcff0d54622b5588 (patch) | |
| tree | 79d88f0d53c6b4b8cc87cd1a0410f34ecd536873 /OpenSim/Region | |
| parent | Revert "Stop performing the asset save part of baked texture uploading on the... (diff) | |
| download | opensim-SC_OLD-8e542cfa03f9368368a0f73fbcff0d54622b5588.zip opensim-SC_OLD-8e542cfa03f9368368a0f73fbcff0d54622b5588.tar.gz opensim-SC_OLD-8e542cfa03f9368368a0f73fbcff0d54622b5588.tar.bz2 opensim-SC_OLD-8e542cfa03f9368368a0f73fbcff0d54622b5588.tar.xz | |
Stop accidentally setting up the UploadTexture caps handler with the same url for all users
This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 2 |
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 | |||
| 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 | } |