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

More namespace and dll name changes. Still no functional changes.

0.8.2-post-fixes
Diva Canto 2015-08-30 21:05:36 -07:00
parent 2c0cad6dd3
commit ce2c67876e
78 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -46,7 +46,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Server.Base;
using OpenSim.Services.Base;
using OpenSim.Services.Interfaces;

2
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Services.Interfaces;
namespace OpenSim.Region.ClientStack

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Framework.Client;
using OpenSim.Framework.Monitoring;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Framework.Capabilities;
using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

2
OpenSim/Region/CoreModules/World/Land/DwellModule.cs
View File

@ -45,7 +45,7 @@ using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Services.Interfaces;
using Caps = OpenSim.Framework.Capabilities.Caps;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

2
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -44,7 +44,7 @@ using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Services.Interfaces;
using Caps = OpenSim.Framework.Capabilities.Caps;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

2
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@ -41,7 +41,7 @@ using Mono.Addins;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Services.Interfaces;
using OpenMetaverse;

2
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@ -35,7 +35,7 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.Framework.Scenes.Animation
{

2
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
View File

@ -36,7 +36,7 @@ using System.Threading;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.Framework.Scenes.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.Runtime.Serialization;

2
OpenSim/Region/Framework/Scenes/Prioritizer.cs
View File

@ -31,7 +31,7 @@ using log4net;
using Nini.Config;
using OpenSim.Framework;
using OpenMetaverse;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
/*
* Steps to add a new prioritization policy:

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

@ -47,7 +47,7 @@ using OpenSim.Framework.Console;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes.Scripting;
using OpenSim.Region.Framework.Scenes.Serialization;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Timer = System.Timers.Timer;
using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

2
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -34,7 +34,7 @@ using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes.Types;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Framework.Scenes

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -38,7 +38,7 @@ using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.Framework.Scenes.Serialization;
using PermissionMask = OpenSim.Framework.PermissionMask;

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -42,7 +42,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes.Scripting;
using OpenSim.Region.Framework.Scenes.Serialization;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using PermissionMask = OpenSim.Framework.PermissionMask;
namespace OpenSim.Region.Framework.Scenes

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -41,7 +41,7 @@ using OpenSim.Framework.Monitoring;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes.Animation;
using OpenSim.Region.Framework.Scenes.Types;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
using OpenSim.Services.Interfaces;
using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;

2
OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
View File

@ -34,7 +34,7 @@ using OpenMetaverse;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.Framework.Scenes.Serialization
{

2
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
View File

@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.CoreModules.Framework.EntityTransfer;
using OpenSim.Region.CoreModules.World.Serialiser;
using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Tests.Common;
namespace OpenSim.Region.Framework.Scenes.Tests

2
OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Framework.Console;
using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.OptionalModules.PhysicsParameters
{

2
OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Region.CoreModules;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Mono.Addins;
using Nini.Config;

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
View File

@ -34,7 +34,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using PrimType=OpenSim.Region.OptionalModules.Scripting.Minimodule.Object.PrimType;
using SculptType=OpenSim.Region.OptionalModules.Scripting.Minimodule.Object.SculptType;

4
OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs
View File

@ -30,9 +30,9 @@ using System.Collections.Generic;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.Physics.BasicPhysicsPlugin
namespace OpenSim.Region.PhysicsModule.BasicPhysics
{
public class BasicActor : PhysicsActor
{

4
OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPlugin.cs
View File

@ -29,9 +29,9 @@ using System;
using System.Collections.Generic;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.Physics.BasicPhysicsPlugin
namespace OpenSim.Region.PhysicsModule.BasicPhysics
{
/// <summary>
/// Effectively a physics plugin that simulates no physics at all.

4
OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs
View File

@ -30,9 +30,9 @@ using System.Collections.Generic;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.Physics.BasicPhysicsPlugin
namespace OpenSim.Region.PhysicsModule.BasicPhysics
{
public class BasicPhysicsPrim : PhysicsActor
{

4
OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
View File

@ -30,9 +30,9 @@ using System.Collections.Generic;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.Physics.BasicPhysicsPlugin
namespace OpenSim.Region.PhysicsModule.BasicPhysics
{
/// <summary>
/// This is an incomplete extremely basic physics implementation

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

@ -31,7 +31,7 @@ using System.Linq;
using System.Text;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OMV = OpenMetaverse;

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

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OMV = OpenMetaverse;

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

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OMV = OpenMetaverse;

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

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OMV = OpenMetaverse;

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

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OMV = OpenMetaverse;

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

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

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

@ -36,7 +36,7 @@ using System.Reflection;
using System.Runtime.InteropServices;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.BulletS
{

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

@ -29,7 +29,7 @@ using System.Collections.Generic;
using System.Reflection;
using System.Text;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenMetaverse;
using Nini.Config;

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

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

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

@ -27,7 +27,7 @@
using System;
using System.Collections.Generic;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.BulletS

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

@ -32,7 +32,7 @@ using System.Xml;
using log4net;
using OMV = OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet;
using OpenSim.Region.OptionalModules.Scripting; // for ExtendedPhysics

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

@ -31,7 +31,7 @@ using System.Reflection;
using System.Runtime.InteropServices;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OMV = OpenMetaverse;

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

@ -72,7 +72,7 @@ public class BSPrimLinkable : BSPrimDisplaced
base.Destroy();
}
public override void link(SharedBase.PhysicsActor obj)
public override void link(OpenSim.Region.PhysicsModules.SharedBase.PhysicsActor obj)
{
BSPrimLinkable parent = obj as BSPrimLinkable;
if (parent != null)

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

@ -36,7 +36,7 @@ using OpenSim.Framework.Monitoring;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules;
using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Nini.Config;
using log4net;
using OpenMetaverse;

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

@ -29,7 +29,7 @@ using System.Collections.Generic;
using System.Text;
using OMV = OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet;
namespace OpenSim.Region.PhysicsModule.BulletS

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

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.Meshing;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet;

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

@ -31,7 +31,7 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Nini.Config;
using log4net;

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

@ -31,7 +31,7 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Nini.Config;
using log4net;

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

@ -31,7 +31,7 @@ using System.Text;
using OpenSim.Framework;
using OpenSim.Region.Framework;
using OpenSim.Region.CoreModules;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Nini.Config;
using log4net;

2
OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs
View File

@ -35,7 +35,7 @@ using log4net;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.BulletS;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Tests.Common;
using OpenMetaverse;

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

@ -33,7 +33,7 @@ using System.Text;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.Meshing;
using OpenMetaverse;

2
OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs
View File

@ -35,7 +35,7 @@ using log4net;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.BulletS;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Tests.Common;
using OpenMetaverse;

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

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

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

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using PrimMesher;
using OpenMetaverse;

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

@ -29,7 +29,7 @@
using System;
using System.Collections.Generic;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using System.Drawing;

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

@ -31,7 +31,7 @@ using System.Reflection;
using OpenMetaverse;
using Ode.NET;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using log4net;
namespace OpenSim.Region.PhysicsModule.ODE

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

@ -46,7 +46,7 @@ using log4net;
using OpenMetaverse;
using Ode.NET;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.ODE
{

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

@ -50,7 +50,7 @@ using log4net;
using OpenMetaverse;
using Ode.NET;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.ODE
{

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

@ -31,7 +31,7 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using OpenMetaverse;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Ode.NET;
using log4net;

2
OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs
View File

@ -29,7 +29,7 @@ using System;
using OpenMetaverse;
using Ode.NET;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ODE;
namespace OpenSim.Region.PhysicsModule.ODE

2
OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs
View File

@ -36,7 +36,7 @@ using log4net;
using Nini.Config;
using Ode.NET;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.ODE

2
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
View File

@ -44,7 +44,7 @@ using OpenMetaverse;
using Drawstuff.NET;
#endif
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.ODE
{

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

@ -30,7 +30,7 @@ using Nini.Config;
using NUnit.Framework;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ODE;
using OpenSim.Tests.Common;
using log4net;

2
OpenSim/Region/PhysicsModules/POS/POSCharacter.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.POS
{

2
OpenSim/Region/PhysicsModules/POS/POSPlugin.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.POS
{

2
OpenSim/Region/PhysicsModules/POS/POSPrim.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.POS
{

2
OpenSim/Region/PhysicsModules/POS/POSScene.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
namespace OpenSim.Region.PhysicsModule.POS
{

2
OpenSim/Region/PhysicsModules/SharedBase/CollisionLocker.cs
View File

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

2
OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
public interface IMesher
{

2
OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
public struct PhysParameterEntry
{

2
OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
View File

@ -32,7 +32,7 @@ using Nini.Config;
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
class NullPhysicsScene : PhysicsScene
{

2
OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs
View File

@ -32,7 +32,7 @@ using System.Reflection;
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
public delegate void PositionUpdate(Vector3 position);
public delegate void VelocityUpdate(Vector3 velocity);

2
OpenSim/Region/PhysicsModules/SharedBase/PhysicsJoint.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
public enum PhysicsJointType : int
{

6
OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs
View File

@ -34,7 +34,7 @@ using log4net;
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
/// <summary>
/// Description of MyClass.
@ -129,8 +129,8 @@ namespace OpenSim.Region.PhysicsModule.SharedBase
public void LoadPluginsFromAssembly(string assemblyPath)
{
// TODO / NOTE
// The assembly named 'OpenSim.Region.Physics.BasicPhysicsPlugin' was loaded from
// 'file:///C:/OpenSim/trunk2/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll'
// The assembly named 'OpenSim.Region.PhysicsModule.BasicPhysics' was loaded from
// 'file:///C:/OpenSim/trunk2/bin/Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll'
// using the LoadFrom context. The use of this context can result in unexpected behavior
// for serialization, casting and dependency resolution. In almost all cases, it is recommended
// that the LoadFrom context be avoided. This can be done by installing assemblies in the

2
OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs
View File

@ -35,7 +35,7 @@ using Nini.Config;
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
public delegate void physicsCrash();

2
OpenSim/Region/PhysicsModules/SharedBase/PhysicsSensor.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Timers;
using OpenMetaverse;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
[Flags]
public enum SenseType : uint

2
OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
/*public class PhysicsVector
{

2
OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs
View File

@ -27,7 +27,7 @@
using System;
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
public enum Vehicle : int
{

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

@ -41,7 +41,7 @@ using Nini.Config;
* it's always availabe and thus the default in case of configuration errors
*/
namespace OpenSim.Region.PhysicsModule.SharedBase
namespace OpenSim.Region.PhysicsModules.SharedBase
{
public class ZeroMesherPlugin : IMeshingPlugin
{

2
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Console;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using Mono.Addins;
namespace OpenSim.Region.RegionCombinerModule

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -51,7 +51,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Animation;
using OpenSim.Region.Framework.Scenes.Scripting;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
using OpenSim.Region.ScriptEngine.Shared.ScriptBase;

4
OpenSim/Tests/Common/Helpers/SceneHelpers.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Framework.Communications;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
@ -149,7 +149,7 @@ namespace OpenSim.Tests.Common
regInfo.RegionSizeY = sizeY;
PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll");
Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
PhysicsScene physicsScene
= physicsPluginManager.GetPhysicsScene(

2
OpenSim/Tests/Common/Mock/TestScene.cs
View File

@ -33,7 +33,7 @@ using OpenSim.Framework.Servers;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Services.Interfaces;
namespace OpenSim.Tests.Common

44
prebuild.xml
View File

@ -410,7 +410,7 @@
</Files>
</Project>
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
@ -438,7 +438,7 @@
</Project>
<!-- Physics Plug-ins -->
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/Physics/BasicPhysics" type="Library">
<Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/PhysicsModules/BasicPhysics" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/Physics/</OutputPath>
@ -455,7 +455,7 @@
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
<Reference name="Nini" path="../../../../bin/"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
@ -478,7 +478,7 @@
<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
<Reference name="Nini" path="../../../../bin/"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
@ -503,7 +503,7 @@
<Reference name="Nini" path="../../../../bin/"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="Ode.NET" path="../../../../bin/"/>
<Reference name="log4net" path="../../../../bin/"/>
@ -536,7 +536,7 @@
<Reference name="Nini" path="../../../../bin/"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="log4net" path="../../../../bin/"/>
<Files>
@ -653,7 +653,7 @@
<Reference name="OpenSim.Framework.Serialization"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<!-- For scripting in funny languages by default -->
<Reference name="XMLRPC" path="../../../bin/"/>
@ -1507,7 +1507,7 @@
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="XMLRPC" path="../../../bin/"/>
<Reference name="Nini" path="../../../bin/"/>
@ -1594,7 +1594,7 @@
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="Mono.Addins" path="../../../../../bin/"/>
<Reference name="Nini" path="../../../../../bin/"/>
@ -1648,7 +1648,7 @@
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Server.Handlers"/>
<Reference name="OpenSim.Services.Connectors"/>
@ -1700,7 +1700,7 @@
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Server.Handlers"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="Nini" path="../../../bin/"/>
@ -1749,7 +1749,7 @@
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Server.Handlers"/>
<Reference name="OpenSim.Services.Connectors"/>
@ -1852,7 +1852,7 @@
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/Physics/"/>
<Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/>
<Reference name="BulletXNA.dll" path="../../../../bin/"/>
@ -1897,7 +1897,7 @@
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Services.Base"/>
<Reference name="OpenSim.Services.Interfaces"/>
@ -2270,7 +2270,7 @@
<Reference name="OpenSim.Framework.Monitoring"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Services.Connectors"/>
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@ -2464,7 +2464,7 @@
<Reference name="OpenSim.Framework.Monitoring"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
<Reference name="Mono.Addins" path="../../../bin/"/>
@ -2729,7 +2729,7 @@
<Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Services.Interfaces"/>
@ -3056,7 +3056,7 @@
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
<Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
<Reference name="OpenSim.Services.Interfaces"/>
@ -3136,7 +3136,7 @@
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
<Reference name="OpenSim.Services.AvatarService"/>
<Reference name="OpenSim.Services.Interfaces"/>
@ -3204,7 +3204,7 @@
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Services.Interfaces"/>
<!-- Unit tests -->
@ -3388,7 +3388,7 @@
<Reference name="Nini" path="../../../../../bin/"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModule.Ode" path="../../../../../bin/Physics/"/>
<Reference name="OpenSim.Tests.Common"/>
<Reference name="Ode.NET" path="../../../../../bin/"/>
@ -3425,7 +3425,7 @@
<Reference name="OpenSim.Tests.Common"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../../bin/Physics/"/>
<Reference name="OpenSim.Region.PhysicsModule.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
<Reference name="OpenSim.Region.PhysicsModule.BulletS" path="../../../../../bin/Physics/"/>
<Files>