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/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |
| parent | Fix intersim object give messages (diff) | |
| parent | Remove unused SceneManager.TryGetAvatarsScene() (diff) | |
| download | opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.zip opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2 opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz | |
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs index e3bf8cf..b7ca703 100644 --- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |||
| @@ -77,8 +77,6 @@ namespace OpenSim.Capabilities.Handlers | |||
| 77 | { | 77 | { |
| 78 | try | 78 | try |
| 79 | { | 79 | { |
| 80 | // m_log.Debug("[CAPS]: UploadBakedTexture Request in region: " + m_regionName); | ||
| 81 | |||
| 82 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; | 80 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; |
| 83 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 81 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
| 84 | 82 | ||