diff options
author | UbitUmarov | 2012-03-11 06:32:06 +0000 |
---|---|---|
committer | UbitUmarov | 2012-03-11 06:32:06 +0000 |
commit | 21a76a619f62e76f366d8bfa1f37f776cfb92fa3 (patch) | |
tree | e8ec6257f3ec47232ac6d25c87202ce5745e55ee /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC_OLD-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.zip opensim-SC_OLD-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.tar.gz opensim-SC_OLD-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.tar.bz2 opensim-SC_OLD-21a76a619f62e76f366d8bfa1f37f776cfb92fa3.tar.xz |
initial steps to support physical phantoms
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 563d527..63b29ba 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
@@ -65,6 +65,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
65 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 65 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
66 | 66 | ||
67 | private bool m_isphysical; | 67 | private bool m_isphysical; |
68 | private bool m_isPhantom; | ||
68 | private bool m_fakeisphysical; | 69 | private bool m_fakeisphysical; |
69 | 70 | ||
70 | protected bool m_building; | 71 | protected bool m_building; |
@@ -831,9 +832,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
831 | 832 | ||
832 | 833 | ||
833 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, | 834 | public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size, |
834 | Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical) | 835 | Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical,bool pisPhantom,uint plocalID) |
835 | { | 836 | { |
836 | Name = primName; | 837 | Name = primName; |
838 | LocalID = plocalID; | ||
837 | 839 | ||
838 | m_vehicle = null; | 840 | m_vehicle = null; |
839 | 841 | ||
@@ -908,6 +910,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
908 | m_isSelected = false; | 910 | m_isSelected = false; |
909 | m_delaySelect = false; | 911 | m_delaySelect = false; |
910 | 912 | ||
913 | m_isPhantom = pisPhantom; | ||
914 | |||
911 | mu = parent_scene.m_materialContactsData[(int)Material.Wood].mu; | 915 | mu = parent_scene.m_materialContactsData[(int)Material.Wood].mu; |
912 | bounce = parent_scene.m_materialContactsData[(int)Material.Wood].bounce; | 916 | bounce = parent_scene.m_materialContactsData[(int)Material.Wood].bounce; |
913 | 917 | ||