aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-08-31 09:41:00 -0700
committerDiva Canto2015-08-31 09:41:00 -0700
commit49ab478d286b873e9ff1b4f6748b920abcc0f1b1 (patch)
treec75b3550c93e0b583118153011e121420f518d3e
parentRefactored Meshing modules: (diff)
downloadopensim-SC-49ab478d286b873e9ff1b4f6748b920abcc0f1b1.zip
opensim-SC-49ab478d286b873e9ff1b4f6748b920abcc0f1b1.tar.gz
opensim-SC-49ab478d286b873e9ff1b4f6748b920abcc0f1b1.tar.bz2
opensim-SC-49ab478d286b873e9ff1b4f6748b920abcc0f1b1.tar.xz
Fixed a namespace dependency. Also started preparing prebuild.xml for making physics region modules.
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/PhysicsModules/BulletS/BSShapes.cs2
-rwxr-xr-xOpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs2
-rw-r--r--prebuild.xml284
3 files changed, 148 insertions, 140 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
index 7357962..1c55b51 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
@@ -31,7 +31,7 @@ using System.Text;
31 31
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.PhysicsModules.SharedBase; 33using OpenSim.Region.PhysicsModules.SharedBase;
34using OpenSim.Region.PhysicsModule.Meshing; 34using OpenSim.Region.PhysicsModules.Meshing;
35using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; 35using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet;
36 36
37using OMV = OpenMetaverse; 37using OMV = OpenMetaverse;
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
index 8915e6f..34c0571 100755
--- a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
@@ -34,7 +34,7 @@ using Nini.Config;
34 34
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.PhysicsModules.SharedBase; 36using OpenSim.Region.PhysicsModules.SharedBase;
37using OpenSim.Region.PhysicsModule.Meshing; 37using OpenSim.Region.PhysicsModules.Meshing;
38 38
39using OpenMetaverse; 39using OpenMetaverse;
40 40
diff --git a/prebuild.xml b/prebuild.xml
index e08ff29..77b1657 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -410,142 +410,6 @@
410 </Files> 410 </Files>
411 </Project> 411 </Project>
412 412
413 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
414 <Configuration name="Debug">
415 <Options>
416 <OutputPath>../../../../bin/</OutputPath>
417 </Options>
418 </Configuration>
419 <Configuration name="Release">
420 <Options>
421 <OutputPath>../../../../bin/</OutputPath>
422 </Options>
423 </Configuration>
424
425 <ReferencePath>../../../../bin/</ReferencePath>
426 <Reference name="System"/>
427 <Reference name="System.Xml"/>
428 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
429 <Reference name="OpenSim.Framework"/>
430 <Reference name="OpenSim.Framework.Console"/>
431 <Reference name="nunit.framework" path="../../../../bin/"/>
432 <Reference name="Nini" path="../../../../bin/"/>
433 <Reference name="log4net" path="../../../../bin/"/>
434
435 <Files>
436 <Match pattern="*.cs" recurse="false"/>
437 </Files>
438 </Project>
439
440 <!-- Physics Plug-ins -->
441 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/PhysicsModules/BasicPhysics" type="Library">
442 <Configuration name="Debug">
443 <Options>
444 <OutputPath>../../../../bin/Physics/</OutputPath>
445 </Options>
446 </Configuration>
447 <Configuration name="Release">
448 <Options>
449 <OutputPath>../../../../bin/Physics/</OutputPath>
450 </Options>
451 </Configuration>
452
453 <ReferencePath>../../../../bin/</ReferencePath>
454 <Reference name="System"/>
455 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
456 <Reference name="Nini" path="../../../../bin/"/>
457 <Reference name="OpenSim.Framework"/>
458 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
459 <Files>
460 <Match pattern="*.cs" recurse="true"/>
461 </Files>
462 </Project>
463
464 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.POS" path="OpenSim/Region/PhysicsModules/POS" type="Library">
465 <Configuration name="Debug">
466 <Options>
467 <OutputPath>../../../../bin/Physics/</OutputPath>
468 </Options>
469 </Configuration>
470 <Configuration name="Release">
471 <Options>
472 <OutputPath>../../../../bin/Physics/</OutputPath>
473 </Options>
474 </Configuration>
475
476 <ReferencePath>../../../../bin/</ReferencePath>
477 <Reference name="System"/>
478 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
479 <Reference name="Nini" path="../../../../bin/"/>
480 <Reference name="OpenSim.Framework"/>
481 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
482 <Files>
483 <Match pattern="*.cs" recurse="true"/>
484 </Files>
485 </Project>
486
487 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.Ode" path="OpenSim/Region/PhysicsModules/Ode" type="Library">
488 <Configuration name="Debug">
489 <Options>
490 <OutputPath>../../../../bin/Physics/</OutputPath>
491 </Options>
492 </Configuration>
493 <Configuration name="Release">
494 <Options>
495 <OutputPath>../../../../bin/Physics/</OutputPath>
496 </Options>
497 </Configuration>
498
499 <ReferencePath>../../../../bin/</ReferencePath>
500 <Reference name="System"/>
501 <Reference name="System.Core"/>
502 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
503 <Reference name="Nini" path="../../../../bin/"/>
504 <Reference name="OpenSim.Framework"/>
505 <Reference name="OpenSim.Framework.Console"/>
506 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
507 <Reference name="Ode.NET" path="../../../../bin/"/>
508 <Reference name="log4net" path="../../../../bin/"/>
509
510 <Files>
511 <Match pattern="*.cs" recurse="true">
512 <Exclude name="Tests" pattern="Tests"/>
513 </Match>
514 </Files>
515 </Project>
516
517 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.Meshing" path="OpenSim/Region/PhysicsModules/Meshing" type="Library">
518 <Configuration name="Debug">
519 <Options>
520 <OutputPath>../../../../bin/Physics/</OutputPath>
521 </Options>
522 </Configuration>
523 <Configuration name="Release">
524 <Options>
525 <OutputPath>../../../../bin/Physics/</OutputPath>
526 </Options>
527 </Configuration>
528
529 <ReferencePath>../../../../bin/</ReferencePath>
530 <Reference name="System"/>
531 <Reference name="System.Drawing"/>
532 <Reference name="CSJ2K" path="../../../../bin/"/>
533 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
534 <Reference name="OpenMetaverse" path="../../../../bin/"/>
535 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
536 <Reference name="Nini" path="../../../../bin/"/>
537 <Reference name="OpenSim.Framework"/>
538 <Reference name="OpenSim.Framework.Console"/>
539 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
540 <Reference name="OpenSim.Region.Framework"/>
541 <Reference name="log4net" path="../../../../bin/"/>
542 <Reference name="Mono.Addins" path="../../../bin/"/>
543
544 <Files>
545 <Match pattern="*.cs" recurse="true"/>
546 </Files>
547 </Project>
548
549 <Project frameworkVersion="v4_0" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library"> 413 <Project frameworkVersion="v4_0" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
550 <Configuration name="Debug"> 414 <Configuration name="Debug">
551 <Options> 415 <Options>
@@ -1828,6 +1692,148 @@
1828 </Files> 1692 </Files>
1829 </Project> 1693 </Project>
1830 1694
1695 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
1696 <Configuration name="Debug">
1697 <Options>
1698 <OutputPath>../../../../bin/</OutputPath>
1699 </Options>
1700 </Configuration>
1701 <Configuration name="Release">
1702 <Options>
1703 <OutputPath>../../../../bin/</OutputPath>
1704 </Options>
1705 </Configuration>
1706
1707 <ReferencePath>../../../../bin/</ReferencePath>
1708 <Reference name="System"/>
1709 <Reference name="System.Xml"/>
1710 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1711 <Reference name="OpenSim.Framework"/>
1712 <Reference name="OpenSim.Framework.Console"/>
1713 <Reference name="nunit.framework" path="../../../../bin/"/>
1714 <Reference name="Nini" path="../../../../bin/"/>
1715 <Reference name="log4net" path="../../../../bin/"/>
1716
1717 <Files>
1718 <Match pattern="*.cs" recurse="false"/>
1719 </Files>
1720 </Project>
1721
1722 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.Meshing" path="OpenSim/Region/PhysicsModules/Meshing" type="Library">
1723 <Configuration name="Debug">
1724 <Options>
1725 <OutputPath>../../../../bin/Physics/</OutputPath>
1726 </Options>
1727 </Configuration>
1728 <Configuration name="Release">
1729 <Options>
1730 <OutputPath>../../../../bin/Physics/</OutputPath>
1731 </Options>
1732 </Configuration>
1733
1734 <ReferencePath>../../../../bin/</ReferencePath>
1735 <Reference name="System"/>
1736 <Reference name="System.Drawing"/>
1737 <Reference name="CSJ2K" path="../../../../bin/"/>
1738 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1739 <Reference name="OpenMetaverse" path="../../../../bin/"/>
1740 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
1741 <Reference name="Nini" path="../../../../bin/"/>
1742 <Reference name="OpenSim.Framework"/>
1743 <Reference name="OpenSim.Framework.Console"/>
1744 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
1745 <Reference name="OpenSim.Region.Framework"/>
1746 <Reference name="Mono.Addins" path="../../../../bin/"/>
1747 <Reference name="log4net" path="../../../../bin/"/>
1748
1749 <Files>
1750 <Match pattern="*.cs" recurse="true"/>
1751 </Files>
1752 </Project>
1753
1754 <!-- Physics Plug-ins -->
1755 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/PhysicsModules/BasicPhysics" type="Library">
1756 <Configuration name="Debug">
1757 <Options>
1758 <OutputPath>../../../../bin/Physics/</OutputPath>
1759 </Options>
1760 </Configuration>
1761 <Configuration name="Release">
1762 <Options>
1763 <OutputPath>../../../../bin/Physics/</OutputPath>
1764 </Options>
1765 </Configuration>
1766
1767 <ReferencePath>../../../../bin/</ReferencePath>
1768 <Reference name="System"/>
1769 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1770 <Reference name="Nini" path="../../../../bin/"/>
1771 <Reference name="OpenSim.Framework"/>
1772 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
1773 <Reference name="OpenSim.Region.Framework"/>
1774 <Reference name="Mono.Addins" path="../../../../bin/"/>
1775 <Files>
1776 <Match pattern="*.cs" recurse="true"/>
1777 </Files>
1778 </Project>
1779
1780 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.POS" path="OpenSim/Region/PhysicsModules/POS" type="Library">
1781 <Configuration name="Debug">
1782 <Options>
1783 <OutputPath>../../../../bin/Physics/</OutputPath>
1784 </Options>
1785 </Configuration>
1786 <Configuration name="Release">
1787 <Options>
1788 <OutputPath>../../../../bin/Physics/</OutputPath>
1789 </Options>
1790 </Configuration>
1791
1792 <ReferencePath>../../../../bin/</ReferencePath>
1793 <Reference name="System"/>
1794 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1795 <Reference name="Nini" path="../../../../bin/"/>
1796 <Reference name="OpenSim.Framework"/>
1797 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
1798 <Reference name="OpenSim.Region.Framework"/>
1799 <Reference name="Mono.Addins" path="../../../../bin/"/>
1800 <Files>
1801 <Match pattern="*.cs" recurse="true"/>
1802 </Files>
1803 </Project>
1804
1805 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.Ode" path="OpenSim/Region/PhysicsModules/Ode" type="Library">
1806 <Configuration name="Debug">
1807 <Options>
1808 <OutputPath>../../../../bin/Physics/</OutputPath>
1809 </Options>
1810 </Configuration>
1811 <Configuration name="Release">
1812 <Options>
1813 <OutputPath>../../../../bin/Physics/</OutputPath>
1814 </Options>
1815 </Configuration>
1816
1817 <ReferencePath>../../../../bin/</ReferencePath>
1818 <Reference name="System"/>
1819 <Reference name="System.Core"/>
1820 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1821 <Reference name="Nini" path="../../../../bin/"/>
1822 <Reference name="OpenSim.Framework"/>
1823 <Reference name="OpenSim.Framework.Console"/>
1824 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
1825 <Reference name="OpenSim.Region.Framework"/>
1826 <Reference name="Mono.Addins" path="../../../../bin/"/>
1827 <Reference name="Ode.NET" path="../../../../bin/"/>
1828 <Reference name="log4net" path="../../../../bin/"/>
1829
1830 <Files>
1831 <Match pattern="*.cs" recurse="true">
1832 <Exclude name="Tests" pattern="Tests"/>
1833 </Match>
1834 </Files>
1835 </Project>
1836
1831 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BulletS" path="OpenSim/Region/PhysicsModules/BulletS" type="Library"> 1837 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BulletS" path="OpenSim/Region/PhysicsModules/BulletS" type="Library">
1832 <Configuration name="Debug"> 1838 <Configuration name="Debug">
1833 <Options> 1839 <Options>
@@ -1855,8 +1861,10 @@
1855 <Reference name="OpenSim.Region.OptionalModules"/> 1861 <Reference name="OpenSim.Region.OptionalModules"/>
1856 <Reference name="OpenSim.Framework.Console"/> 1862 <Reference name="OpenSim.Framework.Console"/>
1857 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> 1863 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
1858 <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/Physics/"/> 1864 <Reference name="OpenSim.Region.PhysicsModules.Meshing" path="../../../../bin/Physics/"/>
1859 <Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/> 1865 <Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/>
1866 <Reference name="OpenSim.Region.Framework"/>
1867 <Reference name="Mono.Addins" path="../../../../bin/"/>
1860 <Reference name="BulletXNA.dll" path="../../../../bin/"/> 1868 <Reference name="BulletXNA.dll" path="../../../../bin/"/>
1861 <Reference name="log4net.dll" path="../../../../bin/"/> 1869 <Reference name="log4net.dll" path="../../../../bin/"/>
1862 1870
@@ -3426,7 +3434,7 @@
3426 <Reference name="OpenSim.Framework"/> 3434 <Reference name="OpenSim.Framework"/>
3427 <Reference name="OpenSim.Tests.Common"/> 3435 <Reference name="OpenSim.Tests.Common"/>
3428 <Reference name="OpenSim.Region.CoreModules"/> 3436 <Reference name="OpenSim.Region.CoreModules"/>
3429 <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../../bin/Physics/"/> 3437 <Reference name="OpenSim.Region.PhysicsModules.Meshing" path="../../../../../bin/Physics/"/>
3430 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> 3438 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
3431 <Reference name="OpenSim.Region.PhysicsModule.BulletS" path="../../../../../bin/Physics/"/> 3439 <Reference name="OpenSim.Region.PhysicsModule.BulletS" path="../../../../../bin/Physics/"/>
3432 3440
generated by cgit v1.1 at 2025-01-02 23:36:28 +0000