diff options
| author | Melanie | 2013-01-06 10:52:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-06 10:52:22 +0000 |
| commit | 083ac92b344262ae72516ba05cc93cdcd2f2a454 (patch) | |
| tree | 1992de8e08171aac3e811fb1d43abc6ad8b894af /OpenSim/Capabilities | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | bug fix, cleanup... (diff) | |
| download | opensim-SC_OLD-083ac92b344262ae72516ba05cc93cdcd2f2a454.zip opensim-SC_OLD-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.gz opensim-SC_OLD-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.bz2 opensim-SC_OLD-083ac92b344262ae72516ba05cc93cdcd2f2a454.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs index 8849a59..4fa604f 100644 --- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |||
| @@ -117,7 +117,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 117 | /// <param name="data"></param> | 117 | /// <param name="data"></param> |
| 118 | private void BakedTextureUploaded(UUID assetID, byte[] data) | 118 | private void BakedTextureUploaded(UUID assetID, byte[] data) |
| 119 | { | 119 | { |
| 120 | // m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString()); | 120 | m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString()); |
| 121 | 121 | ||
| 122 | AssetBase asset; | 122 | AssetBase asset; |
| 123 | asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString()); | 123 | asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString()); |