diff options
| author | Melanie | 2011-12-08 03:24:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-08 03:24:25 +0000 |
| commit | 50aa89dae66246395e9aac4d7d31f010e55473e8 (patch) | |
| tree | b2d23662cc5a51e13f582728bf7064077f9edc32 /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |
| parent | Fix intersim object give messages (diff) | |
| parent | Remove unused SceneManager.TryGetAvatarsScene() (diff) | |
| download | opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.zip opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2 opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz | |
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs')
| -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 | } |