aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs3
-rwxr-xr-xbin/lib32/BulletSim.dllbin538112 -> 540672 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2334329 -> 2347768 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin690688 -> 694272 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2529000 -> 2545183 bytes
-rw-r--r--prebuild.xml116
7 files changed, 61 insertions, 60 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
index 9b1b1a3..fb74cc6 100644
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.CoreModules.Statistics.Logging 42namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
43{ 43{
44 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BinaryLoggingModule")] 44 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BinaryLoggingModule")]
45 public class BinaryLoggingModule : INonSharedRegionModule 45 public class BinaryLoggingModule : INonSharedRegionModule
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 9d41ce8..8773485 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -31,8 +31,9 @@ using System.Text;
31using System.Threading; 31using System.Threading;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework; 33using OpenSim.Region.Framework;
34using OpenSim.Region.Physics.Manager; 34using OpenSim.Region.CoreModules;
35using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; 35using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging;
36using OpenSim.Region.Physics.Manager;
36using Nini.Config; 37using Nini.Config;
37using log4net; 38using log4net;
38using OpenMetaverse; 39using OpenMetaverse;
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index a3ccb98..b312222 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
Binary files differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 0b286aa..da98509 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index d91dac1..25b48c1 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
Binary files differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 891c956..3d4b630 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index b06aa1c..6dbe9f5 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -553,64 +553,6 @@
553 </Files> 553 </Files>
554 </Project> 554 </Project>
555 555
556 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
557 <Configuration name="Debug">
558 <Options>
559 <OutputPath>../../../../bin/</OutputPath>
560 </Options>
561 </Configuration>
562 <Configuration name="Release">
563 <Options>
564 <OutputPath>../../../../bin/</OutputPath>
565 </Options>
566 </Configuration>
567
568 <ReferencePath>../../../../bin/</ReferencePath>
569 <Reference name="System"/>
570 <Reference name="System.Core"/>
571 <Reference name="System.Data"/>
572 <Reference name="System.Xml"/>
573
574 <Files>
575 <Match pattern="*.cs" recurse="true">
576 <Exclude name="Tests" pattern="Tests"/>
577 </Match>
578 </Files>
579 </Project>
580
581 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
582 <Configuration name="Debug">
583 <Options>
584 <OutputPath>../../../../bin/Physics/</OutputPath>
585 </Options>
586 </Configuration>
587 <Configuration name="Release">
588 <Options>
589 <OutputPath>../../../../bin/Physics/</OutputPath>
590 </Options>
591 </Configuration>
592
593 <ReferencePath>../../../../bin/</ReferencePath>
594 <Reference name="System"/>
595 <Reference name="System.Core"/>
596 <Reference name="System.Xml"/>
597 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
598 <Reference name="Nini.dll" path="../../../../bin/"/>
599 <Reference name="OpenSim.Framework"/>
600 <Reference name="OpenSim.Region.Framework"/>
601 <Reference name="OpenSim.Region.CoreModules"/>
602 <Reference name="OpenSim.Framework.Console"/>
603 <Reference name="OpenSim.Region.Physics.Manager"/>
604 <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
605 <Reference name="log4net.dll" path="../../../../bin/"/>
606
607 <Files>
608 <Match pattern="*.cs" recurse="true">
609 <Exclude name="Tests" pattern="Tests"/>
610 </Match>
611 </Files>
612 </Project>
613
614 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> 556 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
615 <Configuration name="Debug"> 557 <Configuration name="Debug">
616 <Options> 558 <Options>
@@ -1739,6 +1681,64 @@
1739 </Files> 1681 </Files>
1740 </Project> 1682 </Project>
1741 1683
1684 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
1685 <Configuration name="Debug">
1686 <Options>
1687 <OutputPath>../../../../bin/</OutputPath>
1688 </Options>
1689 </Configuration>
1690 <Configuration name="Release">
1691 <Options>
1692 <OutputPath>../../../../bin/</OutputPath>
1693 </Options>
1694 </Configuration>
1695
1696 <ReferencePath>../../../../bin/</ReferencePath>
1697 <Reference name="System"/>
1698 <Reference name="System.Core"/>
1699 <Reference name="System.Data"/>
1700 <Reference name="System.Xml"/>
1701
1702 <Files>
1703 <Match pattern="*.cs" recurse="true">
1704 <Exclude name="Tests" pattern="Tests"/>
1705 </Match>
1706 </Files>
1707 </Project>
1708
1709 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
1710 <Configuration name="Debug">
1711 <Options>
1712 <OutputPath>../../../../bin/Physics/</OutputPath>
1713 </Options>
1714 </Configuration>
1715 <Configuration name="Release">
1716 <Options>
1717 <OutputPath>../../../../bin/Physics/</OutputPath>
1718 </Options>
1719 </Configuration>
1720
1721 <ReferencePath>../../../../bin/</ReferencePath>
1722 <Reference name="System"/>
1723 <Reference name="System.Core"/>
1724 <Reference name="System.Xml"/>
1725 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1726 <Reference name="Nini.dll" path="../../../../bin/"/>
1727 <Reference name="OpenSim.Framework"/>
1728 <Reference name="OpenSim.Region.Framework"/>
1729 <Reference name="OpenSim.Region.CoreModules"/>
1730 <Reference name="OpenSim.Framework.Console"/>
1731 <Reference name="OpenSim.Region.Physics.Manager"/>
1732 <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
1733 <Reference name="log4net.dll" path="../../../../bin/"/>
1734
1735 <Files>
1736 <Match pattern="*.cs" recurse="true">
1737 <Exclude name="Tests" pattern="Tests"/>
1738 </Match>
1739 </Files>
1740 </Project>
1741
1742 <!-- OpenSim app --> 1742 <!-- OpenSim app -->
1743 <Project frameworkVersion="v3_5" name="OpenSim" path="OpenSim/Region/Application" type="Exe"> 1743 <Project frameworkVersion="v3_5" name="OpenSim" path="OpenSim/Region/Application" type="Exe">
1744 <Configuration name="Debug"> 1744 <Configuration name="Debug">
generated by cgit v1.1 at 2024-07-01 04:30:51 +0000