diff options
| author | Justin Clark-Casey (justincc) | 2010-03-05 00:27:24 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-03-05 00:27:24 +0000 |
| commit | 8bd114b4dfef5547214245cd8cc039aa30de9ef1 (patch) | |
| tree | b102efebee4af3caf8d0afda4e6f714d4155f7a3 | |
| parent | minor: comment out a forgotton debug log line (diff) | |
| parent | Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This solve... (diff) | |
| download | opensim-SC-8bd114b4dfef5547214245cd8cc039aa30de9ef1.zip opensim-SC-8bd114b4dfef5547214245cd8cc039aa30de9ef1.tar.gz opensim-SC-8bd114b4dfef5547214245cd8cc039aa30de9ef1.tar.bz2 opensim-SC-8bd114b4dfef5547214245cd8cc039aa30de9ef1.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 1 | ||||
| -rw-r--r-- | bin/BclExtras.dll | bin | 178688 -> 0 bytes | |||
| -rw-r--r-- | bin/BclExtras35.dll | bin | 0 -> 153600 bytes | |||
| -rw-r--r-- | prebuild.xml | 4 |
4 files changed, 2 insertions, 3 deletions
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 | |||
| 416 | 416 | ||
| 417 | public list(params object[] args) | 417 | public list(params object[] args) |
| 418 | { | 418 | { |
| 419 | m_data = new object[args.Length]; | ||
| 420 | m_data = args; | 419 | m_data = args; |
| 421 | } | 420 | } |
| 422 | 421 | ||
diff --git a/bin/BclExtras.dll b/bin/BclExtras.dll deleted file mode 100644 index 505cf01..0000000 --- a/bin/BclExtras.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/BclExtras35.dll b/bin/BclExtras35.dll new file mode 100644 index 0000000..7a7480a --- /dev/null +++ b/bin/BclExtras35.dll | |||
| Binary files differ | |||
diff --git a/prebuild.xml b/prebuild.xml index 98a471b..cf0eecc 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -158,7 +158,7 @@ | |||
| 158 | <Reference name="System.Data"/> | 158 | <Reference name="System.Data"/> |
| 159 | <Reference name="System.Drawing"/> | 159 | <Reference name="System.Drawing"/> |
| 160 | <Reference name="System.Web"/> | 160 | <Reference name="System.Web"/> |
| 161 | <Reference name="BclExtras.dll"/> | 161 | <Reference name="BclExtras35.dll"/> |
| 162 | <Reference name="OpenMetaverseTypes.dll"/> | 162 | <Reference name="OpenMetaverseTypes.dll"/> |
| 163 | <Reference name="OpenMetaverse.dll"/> | 163 | <Reference name="OpenMetaverse.dll"/> |
| 164 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 164 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
| @@ -1605,7 +1605,7 @@ | |||
| 1605 | <Reference name="OpenSim.Region.ClientStack"/> | 1605 | <Reference name="OpenSim.Region.ClientStack"/> |
| 1606 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1606 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 1607 | <Reference name="OpenSim.Services.Interfaces"/> | 1607 | <Reference name="OpenSim.Services.Interfaces"/> |
| 1608 | <Reference name="BclExtras.dll"/> | 1608 | <Reference name="BclExtras35.dll"/> |
| 1609 | <Reference name="XMLRPC.dll"/> | 1609 | <Reference name="XMLRPC.dll"/> |
| 1610 | <Reference name="Nini.dll" /> | 1610 | <Reference name="Nini.dll" /> |
| 1611 | <Reference name="log4net.dll"/> | 1611 | <Reference name="log4net.dll"/> |