diff options
| author | Jonathan Freedman | 2010-10-29 23:59:16 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:59:16 -0400 |
| commit | 9e7d3e0f2560b3b324f8540278f9a644c176bf88 (patch) | |
| tree | 0ddf21dd6b4c5c8105cef596e998d0ae7283639c /OpenSim/Framework/Capabilities | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | tweak a few more scene presence logging messages for consistency (diff) | |
| download | opensim-SC_OLD-9e7d3e0f2560b3b324f8540278f9a644c176bf88.zip opensim-SC_OLD-9e7d3e0f2560b3b324f8540278f9a644c176bf88.tar.gz opensim-SC_OLD-9e7d3e0f2560b3b324f8540278f9a644c176bf88.tar.bz2 opensim-SC_OLD-9e7d3e0f2560b3b324f8540278f9a644c176bf88.tar.xz | |
Merge branch 'master' into mantis5110
Diffstat (limited to 'OpenSim/Framework/Capabilities')
| -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; |