diff options
author | Mic Bowman | 2010-12-03 16:17:50 -0800 |
---|---|---|
committer | Melanie | 2010-12-03 23:45:00 +0000 |
commit | df860516bf4fa4e4196be4d5fc26db71d98334f4 (patch) | |
tree | cc941c190fe2647835b9453fdbaaccb85611986d /OpenSim/Framework/Capabilities | |
parent | minor: change OpenSimBase log messages associated with newer module loader to... (diff) | |
download | opensim-SC_OLD-df860516bf4fa4e4196be4d5fc26db71d98334f4.zip opensim-SC_OLD-df860516bf4fa4e4196be4d5fc26db71d98334f4.tar.gz opensim-SC_OLD-df860516bf4fa4e4196be4d5fc26db71d98334f4.tar.bz2 opensim-SC_OLD-df860516bf4fa4e4196be4d5fc26db71d98334f4.tar.xz |
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
Cleaned up (and added) debugging.
Diffstat (limited to 'OpenSim/Framework/Capabilities')
-rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index e7f2e13..63e1e34 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
@@ -990,6 +990,7 @@ namespace OpenSim.Framework.Capabilities | |||
990 | public void BakedTextureUploaded(UUID assetID, byte[] data) | 990 | public void BakedTextureUploaded(UUID assetID, byte[] data) |
991 | { | 991 | { |
992 | // m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); | 992 | // m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); |
993 | |||
993 | AssetBase asset; | 994 | AssetBase asset; |
994 | asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); | 995 | asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); |
995 | asset.Data = data; | 996 | asset.Data = data; |
@@ -1331,6 +1332,7 @@ namespace OpenSim.Framework.Capabilities | |||
1331 | newAssetID = UUID.Random(); | 1332 | newAssetID = UUID.Random(); |
1332 | uploaderPath = path; | 1333 | uploaderPath = path; |
1333 | httpListener = httpServer; | 1334 | httpListener = httpServer; |
1335 | m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); | ||
1334 | } | 1336 | } |
1335 | 1337 | ||
1336 | /// <summary> | 1338 | /// <summary> |
@@ -1358,6 +1360,8 @@ namespace OpenSim.Framework.Capabilities | |||
1358 | handlerUpLoad(newAssetID, data); | 1360 | handlerUpLoad(newAssetID, data); |
1359 | } | 1361 | } |
1360 | 1362 | ||
1363 | m_log.InfoFormat("[CAPS] baked texture upload completed for {0}",newAssetID); | ||
1364 | |||
1361 | return res; | 1365 | return res; |
1362 | } | 1366 | } |
1363 | } | 1367 | } |