diff options
| author | Melanie | 2010-10-29 20:40:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-29 20:40:48 +0100 |
| commit | 9331898c320d7d6046c6d1ad467cdee0e32c8b71 (patch) | |
| tree | 917ff7facdeb38d96f5f69576a134cbad4776eae /OpenSim/Framework/Capabilities/Caps.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Merge branch 'dev-appearance' (diff) | |
| download | opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.zip opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.gz opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.bz2 opensim-SC_OLD-9331898c320d7d6046c6d1ad467cdee0e32c8b71.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Capabilities/Caps.cs')
| -rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 4 |
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; |