aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Capabilities
diff options
context:
space:
mode:
authorMelanie2010-12-04 04:36:44 +0100
committerMelanie2010-12-04 04:36:44 +0100
commitbab6b6cd8712afe8ebbe7f43a11118100b691a41 (patch)
treeeca1d73e404b77cbcb9d1932888f17e40ede485f /OpenSim/Framework/Capabilities
parentConvert the agent asset transactions module to a new style module. (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-bab6b6cd8712afe8ebbe7f43a11118100b691a41.zip
opensim-SC-bab6b6cd8712afe8ebbe7f43a11118100b691a41.tar.gz
opensim-SC-bab6b6cd8712afe8ebbe7f43a11118100b691a41.tar.bz2
opensim-SC-bab6b6cd8712afe8ebbe7f43a11118100b691a41.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Capabilities')
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index b7f9a05..5937ae6 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -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.WarnFormat("[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>
@@ -1362,6 +1362,8 @@ namespace OpenSim.Framework.Capabilities
1362 handlerUpLoad(newAssetID, data); 1362 handlerUpLoad(newAssetID, data);
1363 } 1363 }
1364 1364
1365 m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID);
1366
1365 return res; 1367 return res;
1366 } 1368 }
1367 } 1369 }