diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 1cce4c0..3427199 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -115,90 +115,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
115 | private bool m_suspendUpdates; | 115 | private bool m_suspendUpdates; |
116 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); | 116 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); |
117 | 117 | ||
118 | private SOGVehicle m_vehicle = null; | ||
119 | |||
120 | public int VehicleType | ||
121 | { | ||
122 | get | ||
123 | { | ||
124 | if (m_vehicle == null) | ||
125 | return (int)Vehicle.TYPE_NONE; | ||
126 | else | ||
127 | return (int)m_vehicle.Type; | ||
128 | } | ||
129 | set | ||
130 | { | ||
131 | m_vehicle = null; | ||
132 | if (value == (int)Vehicle.TYPE_NONE) | ||
133 | { | ||
134 | if (RootPart.PhysActor != null) | ||
135 | RootPart.PhysActor.VehicleType = (int)Vehicle.TYPE_NONE; | ||
136 | return; | ||
137 | } | ||
138 | m_vehicle = new SOGVehicle(); | ||
139 | m_vehicle.ProcessTypeChange((Vehicle)value); | ||
140 | { | ||
141 | if (RootPart.PhysActor != null) | ||
142 | RootPart.PhysActor.VehicleType = value; | ||
143 | return; | ||
144 | } | ||
145 | |||
146 | } | ||
147 | } | ||
148 | |||
149 | public void SetVehicleFlags(int param, bool remove) | ||
150 | { | ||
151 | if (m_vehicle == null) | ||
152 | return; | ||
153 | |||
154 | m_vehicle.ProcessVehicleFlags(param, remove); | ||
155 | |||
156 | if (RootPart.PhysActor != null) | ||
157 | { | ||
158 | RootPart.PhysActor.VehicleFlags(param, remove); | ||
159 | } | ||
160 | } | ||
161 | |||
162 | public void SetVehicleFloatParam(int param, float value) | ||
163 | { | ||
164 | if (m_vehicle == null) | ||
165 | return; | ||
166 | |||
167 | m_vehicle.ProcessFloatVehicleParam((Vehicle)param, value); | ||
168 | |||
169 | if (RootPart.PhysActor != null) | ||
170 | { | ||
171 | RootPart.PhysActor.VehicleFloatParam(param, value); | ||
172 | } | ||
173 | } | ||
174 | |||
175 | public void SetVehicleVectorParam(int param, Vector3 value) | ||
176 | { | ||
177 | if (m_vehicle == null) | ||
178 | return; | ||
179 | |||
180 | m_vehicle.ProcessVectorVehicleParam((Vehicle)param, value); | ||
181 | |||
182 | if (RootPart.PhysActor != null) | ||
183 | { | ||
184 | RootPart.PhysActor.VehicleVectorParam(param, value); | ||
185 | } | ||
186 | } | ||
187 | |||
188 | public void SetVehicleRotationParam(int param, Quaternion rotation) | ||
189 | { | ||
190 | if (m_vehicle == null) | ||
191 | return; | ||
192 | |||
193 | m_vehicle.ProcessRotationVehicleParam((Vehicle)param, rotation); | ||
194 | |||
195 | if (RootPart.PhysActor != null) | ||
196 | { | ||
197 | RootPart.PhysActor.VehicleRotationParam(param, rotation); | ||
198 | } | ||
199 | } | ||
200 | |||
201 | |||
202 | public bool areUpdatesSuspended | 118 | public bool areUpdatesSuspended |
203 | { | 119 | { |
204 | get | 120 | get |
@@ -1782,8 +1698,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1782 | // ResetChildPrimPhysicsPositions(); | 1698 | // ResetChildPrimPhysicsPositions(); |
1783 | if (m_rootPart.PhysActor != null) | 1699 | if (m_rootPart.PhysActor != null) |
1784 | { | 1700 | { |
1785 | if (m_vehicle != null) | ||
1786 | m_vehicle.SetVehicle(m_rootPart.PhysActor); | ||
1787 | m_rootPart.PhysActor.Building = false; | 1701 | m_rootPart.PhysActor.Building = false; |
1788 | } | 1702 | } |
1789 | } | 1703 | } |
@@ -1791,10 +1705,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1791 | { | 1705 | { |
1792 | // Apply physics to the root prim | 1706 | // Apply physics to the root prim |
1793 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false); | 1707 | m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false); |
1794 | if (m_rootPart.PhysActor != null && m_vehicle != null) | ||
1795 | { | ||
1796 | m_vehicle.SetVehicle(m_rootPart.PhysActor); | ||
1797 | } | ||
1798 | } | 1708 | } |
1799 | } | 1709 | } |
1800 | 1710 | ||