diff options
author | Melanie | 2011-01-23 23:29:25 +0000 |
---|---|---|
committer | Melanie | 2011-01-23 23:29:25 +0000 |
commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
tree | 63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Region/CoreModules/Agent | |
parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
parent | Fixes mantis #5343 (diff) | |
download | opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index d7f3f2c..4255c79 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -41,8 +41,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
41 | /// </summary> | 41 | /// </summary> |
42 | public class AgentAssetTransactions | 42 | public class AgentAssetTransactions |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger( | 44 | // private static readonly ILog m_log = LogManager.GetLogger( |
45 | MethodBase.GetCurrentMethod().DeclaringType); | 45 | // MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | // Fields | 47 | // Fields |
48 | private bool m_dumpAssetsToFile; | 48 | private bool m_dumpAssetsToFile; |
@@ -167,8 +167,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
167 | { | 167 | { |
168 | if (XferUploaders.ContainsKey(transactionID)) | 168 | if (XferUploaders.ContainsKey(transactionID)) |
169 | { | 169 | { |
170 | m_log.DebugFormat("[XFER]: Asked to update item {0} ({1})", | 170 | // m_log.DebugFormat("[XFER]: Asked to update item {0} ({1})", |
171 | item.Name, item.ID); | 171 | // item.Name, item.ID); |
172 | 172 | ||
173 | // Here we need to get the old asset to extract the | 173 | // Here we need to get the old asset to extract the |
174 | // texture UUIDs if it's a wearable. | 174 | // texture UUIDs if it's a wearable. |
@@ -195,8 +195,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
195 | IInventoryService invService = m_Scene.InventoryService; | 195 | IInventoryService invService = m_Scene.InventoryService; |
196 | invService.UpdateItem(item); | 196 | invService.UpdateItem(item); |
197 | 197 | ||
198 | m_log.DebugFormat("[XFER]: Updated item {0} ({1}) with asset {2}", | 198 | // m_log.DebugFormat("[XFER]: Updated item {0} ({1}) with asset {2}", |
199 | item.Name, item.ID, asset.FullID); | 199 | // item.Name, item.ID, asset.FullID); |
200 | } | 200 | } |
201 | } | 201 | } |
202 | } | 202 | } |