ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

enforce prim size restrictions on physical state change; Place restrictions on ini values

Browse Source
This commit is contained in:
UbitUmarov
2019-02-05 01:45:04 +00:00
parent b8121ad8a2
commit 175817fe55
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -2319,6 +2319,17 @@ namespace OpenSim.Region.Framework.Scenes
if (pa != null)
{
if (UsePhysics != pa.IsPhysical)
{
float minsize = UsePhysics ? ParentGroup.Scene.m_minPhys : ParentGroup.Scene.m_minNonphys;
float maxsize = UsePhysics ? ParentGroup.Scene.m_maxPhys : ParentGroup.Scene.m_maxNonphys;
Vector3 scale = Scale;
scale.X = Util.Clamp(scale.X, minsize, maxsize);
scale.Y = Util.Clamp(scale.Y, minsize, maxsize);
scale.Z = Util.Clamp(scale.Z, minsize, maxsize);
Scale = scale;
}
if (UsePhysics != pa.IsPhysical || isNew)
{
if (pa.IsPhysical) // implies UsePhysics==false for this block
@@ -4776,10 +4787,20 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="applyDynamics">applies velocities, force and torque</param>
private void AddToPhysics(bool isPhysical, bool isPhantom, bool building, bool applyDynamics)
{
PhysicsActor pa;
if (ParentGroup.Scene != null)
{
float minsize = isPhysical ? ParentGroup.Scene.m_minPhys : ParentGroup.Scene.m_minNonphys;
float maxsize = isPhysical ? ParentGroup.Scene.m_maxPhys : ParentGroup.Scene.m_maxNonphys;
Vector3 scale = Scale;
scale.X = Util.Clamp(scale.X, minsize, maxsize);
scale.Y = Util.Clamp(scale.Y, minsize, maxsize);
scale.Z = Util.Clamp(scale.Z, minsize, maxsize);
Scale = scale;
}
PhysicsActor pa;
Vector3 velocity = Velocity;
Vector3 rotationalVelocity = AngularVelocity;;
Vector3 rotationalVelocity = AngularVelocity; ;
try
{