diff options
author | Melanie | 2011-01-23 23:29:25 +0000 |
---|---|---|
committer | Melanie | 2011-01-23 23:29:25 +0000 |
commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
tree | 63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Framework/Capabilities | |
parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
parent | Fixes mantis #5343 (diff) | |
download | opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Capabilities')
-rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index dbb0781..c2f9c3a 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
@@ -765,8 +765,8 @@ namespace OpenSim.Framework.Capabilities | |||
765 | { | 765 | { |
766 | try | 766 | try |
767 | { | 767 | { |
768 | m_log.Debug("[CAPS]: UploadBakedTexture Request in region: " + | 768 | // m_log.Debug("[CAPS]: UploadBakedTexture Request in region: " + |
769 | m_regionName); | 769 | // m_regionName); |
770 | 770 | ||
771 | string capsBase = "/CAPS/" + m_capsObjectPath; | 771 | string capsBase = "/CAPS/" + m_capsObjectPath; |
772 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 772 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
@@ -1332,7 +1332,7 @@ namespace OpenSim.Framework.Capabilities | |||
1332 | newAssetID = UUID.Random(); | 1332 | newAssetID = UUID.Random(); |
1333 | uploaderPath = path; | 1333 | uploaderPath = path; |
1334 | httpListener = httpServer; | 1334 | httpListener = httpServer; |
1335 | m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); | 1335 | // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); |
1336 | } | 1336 | } |
1337 | 1337 | ||
1338 | /// <summary> | 1338 | /// <summary> |
@@ -1360,7 +1360,7 @@ namespace OpenSim.Framework.Capabilities | |||
1360 | 1360 | ||
1361 | httpListener.RemoveStreamHandler("POST", uploaderPath); | 1361 | httpListener.RemoveStreamHandler("POST", uploaderPath); |
1362 | 1362 | ||
1363 | m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); | 1363 | // m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); |
1364 | 1364 | ||
1365 | return res; | 1365 | return res; |
1366 | } | 1366 | } |