diff options
| author | Melanie | 2011-10-27 18:14:38 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-27 18:14:38 +0100 |
| commit | b975cbcbed71b12898052395fbc83a5880273190 (patch) | |
| tree | f149288740af5227a865783a51f566bef537721e /OpenSim/Region/Physics/Manager | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Removed use of 'is' operator and casting to find the root ScenePresence in Me... (diff) | |
| download | opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.zip opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.tar.gz opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.tar.bz2 opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 362f997..49f60f8 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -76,6 +76,8 @@ namespace OpenSim.Region.Physics.Manager | |||
| 76 | /// </summary> | 76 | /// </summary> |
| 77 | public int Count { get { return m_objCollisionList.Count; } } | 77 | public int Count { get { return m_objCollisionList.Count; } } |
| 78 | 78 | ||
| 79 | public bool CollisionsOnPreviousFrame { get; private set; } | ||
| 80 | |||
| 79 | public Dictionary<uint, ContactPoint> m_objCollisionList; | 81 | public Dictionary<uint, ContactPoint> m_objCollisionList; |
| 80 | 82 | ||
| 81 | public CollisionEventUpdate(Dictionary<uint, ContactPoint> objCollisionList) | 83 | public CollisionEventUpdate(Dictionary<uint, ContactPoint> objCollisionList) |