mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 04:05:42 +08:00
Resolved merge
This commit is contained in:
@@ -208,8 +208,7 @@ namespace OpenSim.Region.Physics.Manager
|
||||
public abstract void VehicleFloatParam(int param, float value);
|
||||
public abstract void VehicleVectorParam(int param, Vector3 value);
|
||||
public abstract void VehicleRotationParam(int param, Quaternion rotation);
|
||||
public abstract void VehicleFlagsSet(int flags);
|
||||
public abstract void VehicleFlagsRemove(int flags);
|
||||
public abstract void VehicleFlags(int param, bool remove);
|
||||
|
||||
public abstract void SetVolumeDetect(int param); // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more
|
||||
|
||||
@@ -353,17 +352,12 @@ namespace OpenSim.Region.Physics.Manager
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public override void VehicleFlagsSet(int flags)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public override void VehicleFlagsRemove(int flags)
|
||||
public override void VehicleFlags(int param, bool remove)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public override void SetVolumeDetect(int param)
|
||||
{
|
||||
|
||||
|
||||
@@ -91,7 +91,9 @@ namespace OpenSim.Region.Physics.Manager
|
||||
BANKING_EFFICIENCY = 38,
|
||||
BANKING_MIX = 39,
|
||||
BANKING_TIMESCALE = 40,
|
||||
REFERENCE_FRAME = 44
|
||||
REFERENCE_FRAME = 44,
|
||||
BLOCK_EXIT = 45,
|
||||
ROLL_FRAME = 46
|
||||
|
||||
}
|
||||
|
||||
@@ -107,7 +109,13 @@ namespace OpenSim.Region.Physics.Manager
|
||||
LIMIT_MOTOR_UP = 64,
|
||||
MOUSELOOK_STEER = 128,
|
||||
MOUSELOOK_BANK = 256,
|
||||
CAMERA_DECOUPLED = 512
|
||||
CAMERA_DECOUPLED = 512,
|
||||
NO_X = 1024,
|
||||
NO_Y = 2048,
|
||||
NO_Z = 4096,
|
||||
LOCK_HOVER_HEIGHT = 8192,
|
||||
NO_DEFLECTION = 16392,
|
||||
LOCK_ROTATION = 32784
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user