diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index 48b1f3dcb3..36a2cbf1f8 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs @@ -48,7 +48,6 @@ namespace OpenSim.Region.Capabilities public string name; public string desc; public int created_at; - } [LLSDMap] diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index 7b67f0bbe2..31548a0eb1 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs @@ -110,9 +110,10 @@ namespace OpenSim.Framework return packet; } - private byte[] decoded_header = new byte[10]; + // private byte[] decoded_header = new byte[10]; private PacketType GetType(byte[] bytes) { + byte[] decoded_header = new byte[10 + 8]; ushort id; libsecondlife.PacketFrequency freq; diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs index 08ed4f3da9..4a8bf7b169 100644 --- a/OpenSim/Region/Environment/ModuleLoader.cs +++ b/OpenSim/Region/Environment/ModuleLoader.cs @@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule(); if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) { - m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule"); + m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule"); } else {