Merge branch 'ubitwork'

This commit is contained in:
Melanie
2012-02-19 20:24:00 +01:00
3 changed files with 300 additions and 4 deletions

View File

@@ -3180,6 +3180,18 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public SOPVehicle sopVehicle
{
get
{
return m_vehicle;
}
set
{
m_vehicle = value;
}
}
public int VehicleType
{
@@ -3199,6 +3211,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SetVehicleType(int type)
{
m_vehicle = null;
if (type == (int)Vehicle.TYPE_NONE)
{
if (_parentID ==0 && PhysActor != null)