diff options
| author | Robert Adams | 2015-09-08 04:54:16 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 04:54:16 -0700 |
| commit | e5367d822be9b05e74c859afe2d2956a3e95aa33 (patch) | |
| tree | e904050a30715df587aa527d7f313755177726a7 /OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |
| parent | add lost admin_reset_land method (diff) | |
| parent | Deleted access control spec from [LoginService] section of standalone config.... (diff) | |
| download | opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.zip opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.gz opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.bz2 opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.xz | |
Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/POS/POSCharacter.cs (renamed from OpenSim/Region/Physics/POSPlugin/POSCharacter.cs) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs index 40ab984..32469d9 100644 --- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |||
| @@ -30,9 +30,9 @@ using System.Collections.Generic; | |||
| 30 | using Nini.Config; | 30 | using Nini.Config; |
| 31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
| 32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| 33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 34 | 34 | ||
| 35 | namespace OpenSim.Region.Physics.POSPlugin | 35 | namespace OpenSim.Region.PhysicsModule.POS |
| 36 | { | 36 | { |
| 37 | public class POSCharacter : PhysicsActor | 37 | public class POSCharacter : PhysicsActor |
| 38 | { | 38 | { |