From 5d2f85428895b313029ffe3b67cc953c968d94ca Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 4 Mar 2010 10:38:03 +0000
Subject: Remove a superfluous array creation

---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index e87b1f4..1ea52c5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -416,7 +416,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public list(params object[] args)
             {
-                m_data = new object[args.Length];
                 m_data = args;
             }
 
-- 
cgit v1.1


From f5a088c9cc1e068cc49f13dce3cbbf1beae2468f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Mar 2010 08:33:01 -0800
Subject: Replaced BclExtras.dll with a newer version compiled for .NET 3.5.
 This solves the compilation errors that have been affecting build on Windows
 for the past day. Thanks lkalif for noticing the conflict.

---
 bin/BclExtras.dll   | Bin 178688 -> 0 bytes
 bin/BclExtras35.dll | Bin 0 -> 153600 bytes
 prebuild.xml        |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 bin/BclExtras.dll
 create mode 100644 bin/BclExtras35.dll

diff --git a/bin/BclExtras.dll b/bin/BclExtras.dll
deleted file mode 100644
index 505cf01..0000000
Binary files a/bin/BclExtras.dll and /dev/null differ
diff --git a/bin/BclExtras35.dll b/bin/BclExtras35.dll
new file mode 100644
index 0000000..7a7480a
Binary files /dev/null and b/bin/BclExtras35.dll differ
diff --git a/prebuild.xml b/prebuild.xml
index 98a471b..cf0eecc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -158,7 +158,7 @@
       <Reference name="System.Data"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Web"/>
-      <Reference name="BclExtras.dll"/>
+      <Reference name="BclExtras35.dll"/>
       <Reference name="OpenMetaverseTypes.dll"/>
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="OpenMetaverse.StructuredData.dll"/>
@@ -1605,7 +1605,7 @@
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="BclExtras.dll"/>
+      <Reference name="BclExtras35.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
-- 
cgit v1.1