diff options
| author | Dan Lake | 2011-12-20 14:46:44 -0800 |
|---|---|---|
| committer | Dan Lake | 2011-12-20 14:46:44 -0800 |
| commit | 7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd (patch) | |
| tree | 3de2f42376d23ead500098d98e6d2bbd6e21feda /OpenSim/Capabilities | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| download | opensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.zip opensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.gz opensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.bz2 opensim-SC_OLD-7693e6a3a8d811a75ee3773f0c9ae0b0150dc5cd.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs index c637ccf..594ce9d 100644 --- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |||
| @@ -104,7 +104,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 104 | } | 104 | } |
| 105 | catch (Exception e) | 105 | catch (Exception e) |
| 106 | { | 106 | { |
| 107 | m_log.Error("[UPLOAD BAKED TEXTURE HANDLER]: " + e.ToString()); | 107 | m_log.ErrorFormat("[UPLOAD BAKED TEXTURE HANDLER]: {0}{1}", e.Message, e.StackTrace); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | return null; | 110 | return null; |
| @@ -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.WarnFormat("[CAPS]: 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()); |