Merge branch 'mbworknew1' into ubitworkvarnew

author: UbitUmarov 2015-09-08 15:03:22 +0100
committer: UbitUmarov 2015-09-08 15:03:22 +0100
commit: 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch)
tree: 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
parent: add script events per sec stat, using the time report code, but ignoring the... (diff)
parent: More 'everything is a module' merging. (diff)
download: opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip
opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz
opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2
opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
index 3083a33..1d9179c 100755
--- a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
+++ b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
@@ -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.Physics.Manager;
+using OpenSim.Region.PhysicsModules.SharedBase;
 namespace OpenSim.Region.OptionalModules.PhysicsParameters
 {
author	UbitUmarov	2015-09-08 15:03:22 +0100
committer	UbitUmarov	2015-09-08 15:03:22 +0100
commit	5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch)
tree	03077685e44648264523e1851cd068d51a507e81 /OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
parent	add script events per sec stat, using the time report code, but ignoring the... (diff)
parent	More 'everything is a module' merging. (diff)
download	opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz

diff --git a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs index 3083a33..1d9179c 100755 --- a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs +++ b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Console;
36	using OpenSim.Region.CoreModules.Framework.InterfaceCommander;	36	using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
37	using OpenSim.Region.Framework.Interfaces;	37	using OpenSim.Region.Framework.Interfaces;
38	using OpenSim.Region.Framework.Scenes;	38	using OpenSim.Region.Framework.Scenes;
39	using OpenSim.Region.Physics.Manager;	39	using OpenSim.Region.PhysicsModules.SharedBase;
40		40
41	namespace OpenSim.Region.OptionalModules.PhysicsParameters	41	namespace OpenSim.Region.OptionalModules.PhysicsParameters
42	{	42	{