ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the max sizes of physical and nonphysical prims configurable in OpenSim.ini

Browse Source 
Defaulted to 65536 and 10, respectively
This commit is contained in:
Melanie Thielker
2008-07-20 15:19:26 +00:00
parent 212ab8c6d9
commit 8ae7dc628b
5 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -933,7 +933,7 @@ namespace OpenSim.Region.ScriptEngine.Common
bool allow = true;
foreach(SceneObjectPart part in group.Children.Values)
{
if(part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0)
if(part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys)
{
allow = false;
break;
@@ -1066,19 +1066,19 @@ namespace OpenSim.Region.ScriptEngine.Common
if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
{
if(scale.x > 10.0)
scale.x = 10.0;
if(scale.y > 10.0)
scale.y = 10.0;
if(scale.z > 10.0)
scale.z = 10.0;
if(scale.x > World.m_maxPhys)
scale.x = World.m_maxPhys;
if(scale.y > World.m_maxPhys)
scale.y = World.m_maxPhys;
if(scale.z > World.m_maxPhys)
scale.z = World.m_maxPhys;
}
if(scale.x > 65536.0)
scale.x = 65536.0;
if(scale.y > 65536.0)
scale.y = 65536.0;
if(scale.z > 65536.0)
scale.z = 65536.0;
if(scale.x > World.m_maxNonphys)
scale.x = World.m_maxNonphys;
if(scale.y > World.m_maxNonphys)
scale.y = World.m_maxNonphys;
if(scale.z > World.m_maxNonphys)
scale.z = World.m_maxNonphys;
LLVector3 tmp = part.Scale;
tmp.X = (float)scale.x;
tmp.Y = (float)scale.y;

26
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -775,7 +775,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
bool allow = true;
foreach(SceneObjectPart part in group.Children.Values)
{
if(part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0)
if(part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys)
{
allow = false;
break;
@@ -922,19 +922,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
{
if(scale.x > 10.0)
scale.x = 10.0;
if(scale.y > 10.0)
scale.y = 10.0;
if(scale.z > 10.0)
scale.z = 10.0;
if(scale.x > World.m_maxPhys)
scale.x = World.m_maxPhys;
if(scale.y > World.m_maxPhys)
scale.y = World.m_maxPhys;
if(scale.z > World.m_maxPhys)
scale.z = World.m_maxPhys;
}
if(scale.x > 65536.0)
scale.x = 65536.0;
if(scale.y > 65536.0)
scale.y = 65536.0;
if(scale.z > 65536.0)
scale.z = 65536.0;
if(scale.x > World.m_maxNonphys)
scale.x = World.m_maxNonphys;
if(scale.y > World.m_maxNonphys)
scale.y = World.m_maxNonphys;
if(scale.z > World.m_maxNonphys)
scale.z = World.m_maxNonphys;
LLVector3 tmp = part.Scale;
tmp.X = (float)scale.x;
tmp.Y = (float)scale.y;