diff options
| author | Diva Canto | 2010-03-04 08:33:01 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-03-04 08:33:01 -0800 |
| commit | f5a088c9cc1e068cc49f13dce3cbbf1beae2468f (patch) | |
| tree | 6c8359d0f648e86bbc792ee7304d465b4e53b79a | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-f5a088c9cc1e068cc49f13dce3cbbf1beae2468f.zip opensim-SC-f5a088c9cc1e068cc49f13dce3cbbf1beae2468f.tar.gz opensim-SC-f5a088c9cc1e068cc49f13dce3cbbf1beae2468f.tar.bz2 opensim-SC-f5a088c9cc1e068cc49f13dce3cbbf1beae2468f.tar.xz | |
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.
| -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 |
3 files changed, 2 insertions, 2 deletions
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"/> |