aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2012-02-19 20:24:00 +0100
committerMelanie2012-02-19 20:24:00 +0100
commit433d5f1d3e60438fcad9019fc6e7c0fd11386a8e (patch)
tree22a6bc8b9f1cdf4f230cbbbc3c5437a91c5a025e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentFix merge issues in prebuild (diff)
parentsimplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs (diff)
downloadopensim-SC-433d5f1d3e60438fcad9019fc6e7c0fd11386a8e.zip
opensim-SC-433d5f1d3e60438fcad9019fc6e7c0fd11386a8e.tar.gz
opensim-SC-433d5f1d3e60438fcad9019fc6e7c0fd11386a8e.tar.bz2
opensim-SC-433d5f1d3e60438fcad9019fc6e7c0fd11386a8e.tar.xz
Merge branch 'ubitwork'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index de1dd8c..613f9b5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3180,6 +3180,18 @@ namespace OpenSim.Region.Framework.Scenes
3180 } 3180 }
3181 } 3181 }
3182 3182
3183 public SOPVehicle sopVehicle
3184 {
3185 get
3186 {
3187 return m_vehicle;
3188 }
3189 set
3190 {
3191 m_vehicle = value;
3192 }
3193 }
3194
3183 3195
3184 public int VehicleType 3196 public int VehicleType
3185 { 3197 {
@@ -3199,6 +3211,7 @@ namespace OpenSim.Region.Framework.Scenes
3199 public void SetVehicleType(int type) 3211 public void SetVehicleType(int type)
3200 { 3212 {
3201 m_vehicle = null; 3213 m_vehicle = null;
3214
3202 if (type == (int)Vehicle.TYPE_NONE) 3215 if (type == (int)Vehicle.TYPE_NONE)
3203 { 3216 {
3204 if (_parentID ==0 && PhysActor != null) 3217 if (_parentID ==0 && PhysActor != null)