aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Capabilities
diff options
context:
space:
mode:
authorMelanie2010-12-04 00:09:32 +0000
committerMelanie2010-12-04 00:09:32 +0000
commit24af7b8384d8236ad049c5432dfb574cb3b59dfe (patch)
tree2b9949652e0f4a9f4cf62e1b8a080a9aa37cfb71 /OpenSim/Framework/Capabilities
parentWhen linking something, immediately persist the linked set. (diff)
parentVarious bug fixes for appearance handling: more aggressive reset of textures ... (diff)
downloadopensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.zip
opensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.tar.gz
opensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.tar.bz2
opensim-SC-24af7b8384d8236ad049c5432dfb574cb3b59dfe.tar.xz
Merge branch 'master' 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 }