diff options
| author | Melanie | 2010-11-02 22:58:33 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-02 22:58:33 +0000 |
| commit | 26f12f479f17aef37451fb30f9b1de376c8676ac (patch) | |
| tree | ecaf084da6ca491301450c0f8a8460a8b1dc981a /OpenSim/Framework/Capabilities/Caps.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Fix default club feet (diff) | |
| download | opensim-SC-26f12f479f17aef37451fb30f9b1de376c8676ac.zip opensim-SC-26f12f479f17aef37451fb30f9b1de376c8676ac.tar.gz opensim-SC-26f12f479f17aef37451fb30f9b1de376c8676ac.tar.bz2 opensim-SC-26f12f479f17aef37451fb30f9b1de376c8676ac.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, 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; |