aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-01-21 23:48:11 +0000
committerMelanie2010-01-21 23:48:11 +0000
commitd2e17f4ffb3bbd4e377152bef097d47d481c6c5c (patch)
tree82603908ff006d9c61d28c56ea8b5296933223fc /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster (diff)
parentAdd glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associat... (diff)
downloadopensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.zip
opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.gz
opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.bz2
opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs20
1 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a7c14cf..04be9fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.Framework.Scenes
109 109
110 // TODO: This needs to be persisted in next XML version update! 110 // TODO: This needs to be persisted in next XML version update!
111 [XmlIgnore] 111 [XmlIgnore]
112 public readonly int[] PayPrice = {-2,-2,-2,-2,-2}; 112 public int[] PayPrice = {-2,-2,-2,-2,-2};
113 [XmlIgnore] 113 [XmlIgnore]
114 public PhysicsActor PhysActor; 114 public PhysicsActor PhysActor;
115 115
@@ -2963,7 +2963,23 @@ namespace OpenSim.Region.Framework.Scenes
2963 PhysActor.VehicleRotationParam(param, rotation); 2963 PhysActor.VehicleRotationParam(param, rotation);
2964 } 2964 }
2965 } 2965 }
2966 2966
2967 public void SetVehicleFlags(int flags)
2968 {
2969 if (PhysActor != null)
2970 {
2971 PhysActor.VehicleFlagsSet(flags);
2972 }
2973 }
2974
2975 public void RemoveVehicleFlags(int flags)
2976 {
2977 if (PhysActor != null)
2978 {
2979 PhysActor.VehicleFlagsRemove(flags);
2980 }
2981 }
2982
2967 public void SetGroup(UUID groupID, IClientAPI client) 2983 public void SetGroup(UUID groupID, IClientAPI client)
2968 { 2984 {
2969 _groupID = groupID; 2985 _groupID = groupID;