aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Capabilities
diff options
context:
space:
mode:
authorMelanie2010-10-29 20:24:14 +0100
committerMelanie2010-10-29 20:24:14 +0100
commit05d2302c62949f27f8f4314dd649965c7f20aaba (patch)
tree672d0d8327d521dfefb44dc5d7d1d49ed8642ee0 /OpenSim/Framework/Capabilities
parentRevert "Preliminary work on appearance layers. No user functionality yet." (diff)
parentMerge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... (diff)
downloadopensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.zip
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.gz
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.bz2
opensim-SC-05d2302c62949f27f8f4314dd649965c7f20aaba.tar.xz
Merge branch 'dev-appearance'
Diffstat (limited to '')
-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 72283de..6b64e12 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -976,7 +976,9 @@ namespace OpenSim.Framework.Capabilities
976 976
977 public void BakedTextureUploaded(UUID assetID, byte[] data) 977 public void BakedTextureUploaded(UUID assetID, byte[] data)
978 { 978 {
979 m_log.DebugFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); 979// DEBUG ON
980 m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
981// DEBUG OFF
980 AssetBase asset; 982 AssetBase asset;
981 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); 983 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString());
982 asset.Data = data; 984 asset.Data = data;