aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Capabilities
diff options
context:
space:
mode:
authorMelanie2010-10-30 00:56:42 +0100
committerMelanie2010-10-30 00:56:42 +0100
commit7503c4ad6148d0483b0465911ee94bb6ccc9cb0a (patch)
treeafb5fb0be6c41e4f47d5177903443e753b93e904 /OpenSim/Framework/Capabilities
parentREAD CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. (diff)
parentChange level of some logging messages, turning some info into arguably more a... (diff)
downloadopensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.zip
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.gz
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.bz2
opensim-SC_OLD-7503c4ad6148d0483b0465911ee94bb6ccc9cb0a.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Capabilities')
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 872de9a..7b0e053 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -988,9 +988,7 @@ namespace OpenSim.Framework.Capabilities
988 988
989 public void BakedTextureUploaded(UUID assetID, byte[] data) 989 public void BakedTextureUploaded(UUID assetID, byte[] data)
990 { 990 {
991// DEBUG ON 991// m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
992 m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
993// DEBUG OFF
994 AssetBase asset; 992 AssetBase asset;
995 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); 993 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString());
996 asset.Data = data; 994 asset.Data = data;