mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 00:46:02 +08:00
Merge branch 'ubitwork'
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user