aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2008-03-20 15:33:08 +0000
committerMW2008-03-20 15:33:08 +0000
commitf61ea1998e07858a7553b2a805cfc3647aa89a5a (patch)
tree58d66aff8966297a317e0b2cee516a04ae15d548
parentAnother poxy patch which consists mainly of logging changes (some already com... (diff)
downloadopensim-SC_OLD-f61ea1998e07858a7553b2a805cfc3647aa89a5a.zip
opensim-SC_OLD-f61ea1998e07858a7553b2a805cfc3647aa89a5a.tar.gz
opensim-SC_OLD-f61ea1998e07858a7553b2a805cfc3647aa89a5a.tar.bz2
opensim-SC_OLD-f61ea1998e07858a7553b2a805cfc3647aa89a5a.tar.xz
Added back a fix that lbsa71 did aqes ago to fix a buffer overflow in the packetpool, which somewhere through time got lost/reverted
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs1
-rw-r--r--OpenSim/Framework/PacketPool.cs3
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index 48b1f3d..36a2cbf 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Region.Capabilities
48 public string name; 48 public string name;
49 public string desc; 49 public string desc;
50 public int created_at; 50 public int created_at;
51
52 } 51 }
53 52
54 [LLSDMap] 53 [LLSDMap]
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 7b67f0b..31548a0 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -110,9 +110,10 @@ namespace OpenSim.Framework
110 return packet; 110 return packet;
111 } 111 }
112 112
113 private byte[] decoded_header = new byte[10]; 113 // private byte[] decoded_header = new byte[10];
114 private PacketType GetType(byte[] bytes) 114 private PacketType GetType(byte[] bytes)
115 { 115 {
116 byte[] decoded_header = new byte[10 + 8];
116 ushort id; 117 ushort id;
117 libsecondlife.PacketFrequency freq; 118 libsecondlife.PacketFrequency freq;
118 119
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index 08ed4f3..4a8bf7b 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment
140 AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule(); 140 AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule();
141 if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) 141 if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
142 { 142 {
143 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule"); 143 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule");
144 } 144 }
145 else 145 else
146 { 146 {