Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

slimupdates
Justin Clark-Casey (justincc) 2010-03-05 00:27:24 +00:00
commit 8bd114b4df
4 changed files with 2 additions and 3 deletions

View File

@ -416,7 +416,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
public list(params object[] args) public list(params object[] args)
{ {
m_data = new object[args.Length];
m_data = args; m_data = args;
} }

Binary file not shown.

BIN
bin/BclExtras35.dll Normal file

Binary file not shown.

View File

@ -158,7 +158,7 @@
<Reference name="System.Data"/> <Reference name="System.Data"/>
<Reference name="System.Drawing"/> <Reference name="System.Drawing"/>
<Reference name="System.Web"/> <Reference name="System.Web"/>
<Reference name="BclExtras.dll"/> <Reference name="BclExtras35.dll"/>
<Reference name="OpenMetaverseTypes.dll"/> <Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/> <Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/> <Reference name="OpenMetaverse.StructuredData.dll"/>
@ -1605,7 +1605,7 @@
<Reference name="OpenSim.Region.ClientStack"/> <Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Services.Interfaces"/> <Reference name="OpenSim.Services.Interfaces"/>
<Reference name="BclExtras.dll"/> <Reference name="BclExtras35.dll"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
<Reference name="log4net.dll"/> <Reference name="log4net.dll"/>