aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/UploadBakedTexture
diff options
context:
space:
mode:
authorMelanie2011-12-08 03:37:48 +0100
committerMelanie2011-12-08 03:37:48 +0100
commit7c7dd6269a0efff5b4619028825a46fcab84de63 (patch)
treecbe6c622fc1c069f3a33636fd1174d314dec074a /OpenSim/Capabilities/Handlers/UploadBakedTexture
parentRecover from an internal mess-up in the outgoing packet queues by creating (diff)
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.zip
opensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.gz
opensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.bz2
opensim-SC_OLD-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.xz
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs2
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