OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a mess with Modules and Module

avinationmerge
UbitUmarov 2015-09-08 20:03:54 +01:00
parent 3780e98d36
commit 40fd7cbf74
42 changed files with 56 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -932,23 +932,7 @@ namespace OpenSim.Region.Framework.Scenes
EventManager.OnLandObjectRemoved +=
new EventManager.LandObjectRemoved(simDataService.RemoveLandObject);
m_sceneGraph = new SceneGraph(this);
m_sceneGraph.PhysicsScene = PhysicsScene;
// If the scene graph has an Unrecoverable error, restart this sim.
// Currently the only thing that causes it to happen is two kinds of specific
// Physics based crashes.
//
// Out of memory
// Operating system has killed the plugin
m_sceneGraph.UnRecoverableError
+= () =>
{
m_log.ErrorFormat("[SCENE]: Restarting region {0} due to unrecoverable physics crash", Name);
RestartNow();
};
RegisterDefaultSceneEvents();
RegisterDefaultSceneEvents();
// XXX: Don't set the public property since we don't want to activate here. This needs to be handled
// better in the future.
@ -1199,8 +1183,7 @@ namespace OpenSim.Region.Framework.Scenes
StatsReporter.OnSendStatsResult += SendSimStatsPackets;
StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
MainConsole.Instance.Commands.AddCommand("scene", false, "gc collect", "gc collect", "gc collect", "Cause the garbage collector to make a single pass", HandleGcCollect);
}
public Scene(RegionInfo regInfo)
@ -1223,36 +1206,13 @@ namespace OpenSim.Region.Framework.Scenes
PhysicalPrims = true;
CollidablePrims = true;
// this is done above acording to config
// PhysicsEnabled = true;
PhysicsEnabled = true;
AllowAvatarCrossing = true;
PeriodicBackup = true;
UseBackup = true;
IsReprioritizationEnabled = true;
UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time;
ReprioritizationInterval = 5000;

2
OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
View File

@ -33,7 +33,7 @@ using log4net;
using OMV = OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet;
namespace OpenSim.Region.PhysicsModule.BulletS
{

1
OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
View File

@ -30,7 +30,6 @@ using System.Text;
using OMV = OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
namespace OpenSim.Region.PhysicsModule.BulletS
{

4
OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
View File

@ -31,8 +31,8 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.Meshing;
using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
using OpenSim.Region.PhysicsModule.Meshing;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet;
using OMV = OpenMetaverse;

4
OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs
View File

@ -34,7 +34,7 @@ using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.Meshing;
using OpenSim.Region.PhysicsModule.Meshing;
using OpenSim.Region.Framework.Interfaces;
using OpenMetaverse;
@ -86,7 +86,7 @@ public static class BulletSimTestsUtil
info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize;
OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info);
IMesher mesher = new OpenSim.Region.PhysicsModules.Meshing.Meshmerizer();
IMesher mesher = new OpenSim.Region.PhysicsModule.Meshing.Meshmerizer();
INonSharedRegionModule mod = mesher as INonSharedRegionModule;
mod.Initialise(openSimINI);
mod.AddRegion(scene);

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
View File

@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class Wpoint
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public static class Concavity
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class DecompDesc
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public delegate void ConvexDecompositionCallback(ConvexResult result);

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
View File

@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class ConvexResult
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
View File

@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class HullResult
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class HullTriangle : int3
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public static class HullUtils
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class Plane
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public enum PlaneTriResult : int
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class Quaternion : float4
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
View File

@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class Rect3d
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
View File

@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class VertexPool
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class float2
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class float3 : IEquatable<float3>
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class float3x3
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class float4
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class float4x4
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class int3
{

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet
{
public class int4
{

2
OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs
View File

@ -31,7 +31,7 @@ using System.Diagnostics;
using System.Globalization;
using OpenMetaverse;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.Meshing;
using OpenSim.Region.PhysicsModule.Meshing;
public class Vertex : IComparable<Vertex>
{

2
OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs
View File

@ -33,7 +33,7 @@ using OpenSim.Region.PhysicsModules.SharedBase;
using PrimMesher;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModules.Meshing
namespace OpenSim.Region.PhysicsModule.Meshing
{
public class Mesh : IMesh
{

2
OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs
View File

@ -44,7 +44,7 @@ using log4net;
using Nini.Config;
using Mono.Addins;
namespace OpenSim.Region.PhysicsModules.Meshing
namespace OpenSim.Region.PhysicsModule.Meshing
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "Meshmerizer")]
public class Meshmerizer : IMesher, INonSharedRegionModule

4
OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
View File

@ -6,7 +6,7 @@ using Mono.Addins;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("OpenSim.Region.PhysicsModules.Meshing")]
[assembly: AssemblyTitle("OpenSim.Region.PhysicsModule.Meshing")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("http://opensimulator.org")]
@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.2.*")]
[assembly: Addin("OpenSim.Region.PhysicsModules.Meshing", OpenSim.VersionInfo.VersionNumber)]
[assembly: Addin("OpenSim.Region.PhysicsModule.Meshing", OpenSim.VersionInfo.VersionNumber)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]

2
OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs
View File

@ -47,7 +47,7 @@ using log4net;
* it's always availabe and thus the default in case of configuration errors
*/
namespace OpenSim.Region.PhysicsModules.Meshing
namespace OpenSim.Region.PhysicsModule.Meshing
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ZeroMesher")]

2
OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs
View File

@ -65,7 +65,7 @@ namespace OpenSim.Region.PhysicsModule.ODE.Tests
info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize;
OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info);
//IMesher mesher = new OpenSim.Region.PhysicsModules.Meshing.Meshmerizer();
//IMesher mesher = new OpenSim.Region.PhysicsModule.Meshing.Meshmerizer();
//INonSharedRegionModule mod = mesher as INonSharedRegionModule;
//mod.Initialise(openSimINI);
//mod.AddRegion(scene);

2
OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs
View File

@ -31,7 +31,7 @@ using System.Diagnostics;
using System.Globalization;
using OpenMetaverse;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.UbitMeshing;
using OpenSim.Region.PhysicsModule.UbitMeshing;
public class Vertex : IComparable<Vertex>
{

2
OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs
View File

@ -35,7 +35,7 @@ using OpenMetaverse;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
namespace OpenSim.Region.PhysicsModules.UbitMeshing
namespace OpenSim.Region.PhysicsModule.UbitMeshing
{
public class MeshBuildingData
{

4
OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
View File

@ -32,7 +32,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using System.Drawing;
@ -49,7 +49,7 @@ using System.Runtime.Serialization.Formatters.Binary;
using Mono.Addins;
namespace OpenSim.Region.PhysicsModules.UbitMeshing
namespace OpenSim.Region.PhysicsModule.UbitMeshing
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UbitMeshmerizer")]
public class UbitMeshmerizer : IMesher, INonSharedRegionModule

2
OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs
View File

@ -37,7 +37,7 @@ using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
using log4net;
namespace OpenSim.Region.PhysicsModules.UbitOde
namespace OpenSim.Region.PhysicsModule.UbitOde
{
/// <summary>
/// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.

2
OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs
View File

@ -50,7 +50,7 @@ using OdeAPI;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModules.UbitOde
namespace OpenSim.Region.PhysicsModule.UbitOde
{
public class ODEDynamics
{

2
OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs
View File

@ -16,7 +16,7 @@ using log4net;
using Nini.Config;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModules.UbitOde
namespace OpenSim.Region.PhysicsModule.UbitOde
{
public enum MeshState : byte
{

2
OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs
View File

@ -57,7 +57,7 @@ using OdeAPI;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModules.UbitOde
namespace OpenSim.Region.PhysicsModule.UbitOde
{
public class OdePrim : PhysicsActor
{

2
OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs
View File

@ -36,7 +36,7 @@ using OdeAPI;
using log4net;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModules.UbitOde
namespace OpenSim.Region.PhysicsModule.UbitOde
{
/// <summary>
/// Processes raycast requests as ODE is in a state to be able to do them.

2
OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs
View File

@ -36,7 +36,7 @@ using OdeAPI;
using log4net;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModules.UbitOde
namespace OpenSim.Region.PhysicsModule.UbitOde
{
/// <summary>
/// </summary>

3
OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
View File

@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModules.UbitOde
namespace OpenSim.Region.PhysicsModule.UbitOde
{
// colision flags of things others can colide with
// rays, sensors, probes removed since can't be colided with
@ -384,6 +384,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde
PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName;
scene.RegisterModuleInterface<PhysicsScene>(this);
Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ);
Initialization(extent);

18
prebuild.xml
View File

@ -359,7 +359,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.UbitOde" path="OpenSim/Region/PhysicsModules/UbitOde" type="Library">
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.UbitOde" path="OpenSim/Region/PhysicsModules/UbitOde" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@ -381,7 +381,7 @@
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/>
<Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/>
<Reference name="Mono.Addins" path="../../../../bin/"/>
<Reference name="log4net" path="../../../../bin/"/>
@ -392,7 +392,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.UbitMeshing" path="OpenSim/Region/PhysicsModules/UbitMeshing" type="Library">
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.UbitMeshing" path="OpenSim/Region/PhysicsModules/UbitMeshing" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@ -416,7 +416,7 @@
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/>
<Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/>
<Reference name="zlib.net" path="../../../../bin/"/>
<Reference name="Mono.Addins" path="../../../../bin/"/>
<Reference name="log4net" path="../../../../bin/"/>
@ -1592,7 +1592,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet" path="OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet" type="Library">
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet" path="OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@ -1617,7 +1617,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.Meshing" path="OpenSim/Region/PhysicsModules/Meshing" type="Library">
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.Meshing" path="OpenSim/Region/PhysicsModules/Meshing" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@ -1757,8 +1757,8 @@
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.Meshing" path="../../../../bin/"/>
<Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/>
<Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/"/>
<Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/>
<Reference name="Mono.Addins" path="../../../../bin/"/>
<Reference name="BulletXNA.dll" path="../../../../bin/"/>
<Reference name="log4net.dll" path="../../../../bin/"/>
@ -3223,7 +3223,7 @@
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Tests.Common"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.PhysicsModules.Meshing"/>
<Reference name="OpenSim.Region.PhysicsModule.Meshing"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModule.BulletS"/>