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

Defaulted to 65536 and 10, respectively
author: Melanie Thielker 2008-07-20 15:19:26 +0000
committer: Melanie Thielker 2008-07-20 15:19:26 +0000
commit: 8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e (patch)
tree: 33f604591d56737cd417975911612efa0fac3bd3 /OpenSim/Region/ScriptEngine
parent: Change SQLite argument marker from the more standard '@' to the ':' supported (diff)
download: opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.zip
opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.gz
opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.bz2
opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.xz
2 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 40e225d..7745d95 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -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)
+                if(scale.x > World.m_maxPhys)
-                    scale.x = 10.0;
+                    scale.x = World.m_maxPhys;
-                if(scale.y > 10.0)
+                if(scale.y > World.m_maxPhys)
-                    scale.y = 10.0;
+                    scale.y = World.m_maxPhys;
-                if(scale.z > 10.0)
+                if(scale.z > World.m_maxPhys)
-                    scale.z = 10.0;
+                    scale.z = World.m_maxPhys;
-            }
+            }
-            if(scale.x > 65536.0)
+            if(scale.x > World.m_maxNonphys)
-                scale.x = 65536.0;
+                scale.x = World.m_maxNonphys;
-            if(scale.y > 65536.0)
+            if(scale.y > World.m_maxNonphys)
-                scale.y = 65536.0;
+                scale.y = World.m_maxNonphys;
-            if(scale.z > 65536.0)
+            if(scale.z > World.m_maxNonphys)
-                scale.z = 65536.0;
+                scale.z = World.m_maxNonphys;
            LLVector3 tmp = part.Scale;
            tmp.X = (float)scale.x;
            tmp.Y = (float)scale.y;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c597661..79bd6fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -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)
+                if(scale.x > World.m_maxPhys)
-                    scale.x = 10.0;
+                    scale.x = World.m_maxPhys;
-                if(scale.y > 10.0)
+                if(scale.y > World.m_maxPhys)
-                    scale.y = 10.0;
+                    scale.y = World.m_maxPhys;
-                if(scale.z > 10.0)
+                if(scale.z > World.m_maxPhys)
-                    scale.z = 10.0;
+                    scale.z = World.m_maxPhys;
-            }
+            }
-            if(scale.x > 65536.0)
+            if(scale.x > World.m_maxNonphys)
-                scale.x = 65536.0;
+                scale.x = World.m_maxNonphys;
-            if(scale.y > 65536.0)
+            if(scale.y > World.m_maxNonphys)
-                scale.y = 65536.0;
+                scale.y = World.m_maxNonphys;
-            if(scale.z > 65536.0)
+            if(scale.z > World.m_maxNonphys)
-                scale.z = 65536.0;
+                scale.z = World.m_maxNonphys;
            LLVector3 tmp = part.Scale;
            tmp.X = (float)scale.x;
            tmp.Y = (float)scale.y;
author	Melanie Thielker	2008-07-20 15:19:26 +0000
committer	Melanie Thielker	2008-07-20 15:19:26 +0000
commit	8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e (patch)
tree	33f604591d56737cd417975911612efa0fac3bd3 /OpenSim/Region/ScriptEngine
parent	Change SQLite argument marker from the more standard '@' to the ':' supported (diff)
download	opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.zip opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.gz opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.bz2 opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 40e225d..7745d95 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -933,7 +933,7 @@ namespace OpenSim.Region.ScriptEngine.Common
933	bool allow = true;	933	bool allow = true;
934	foreach(SceneObjectPart part in group.Children.Values)	934	foreach(SceneObjectPart part in group.Children.Values)
935	{	935	{
936	if(part.Scale.X > 10.0 \|\| part.Scale.Y > 10.0 \|\| part.Scale.Z > 10.0)	936	if(part.Scale.X > World.m_maxPhys \|\| part.Scale.Y > World.m_maxPhys \|\| part.Scale.Z > World.m_maxPhys)
937	{	937	{
938	allow = false;	938	allow = false;
939	break;	939	break;
@@ -1066,19 +1066,19 @@ namespace OpenSim.Region.ScriptEngine.Common
1066		1066
1067	if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)	1067	if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
1068	{	1068	{
1069	if(scale.x > 10.0)	1069	if(scale.x > World.m_maxPhys)
1070	scale.x = 10.0;	1070	scale.x = World.m_maxPhys;
1071	if(scale.y > 10.0)	1071	if(scale.y > World.m_maxPhys)
1072	scale.y = 10.0;	1072	scale.y = World.m_maxPhys;
1073	if(scale.z > 10.0)	1073	if(scale.z > World.m_maxPhys)
1074	scale.z = 10.0;	1074	scale.z = World.m_maxPhys;
1075	}	1075	}
1076	if(scale.x > 65536.0)	1076	if(scale.x > World.m_maxNonphys)
1077	scale.x = 65536.0;	1077	scale.x = World.m_maxNonphys;
1078	if(scale.y > 65536.0)	1078	if(scale.y > World.m_maxNonphys)
1079	scale.y = 65536.0;	1079	scale.y = World.m_maxNonphys;
1080	if(scale.z > 65536.0)	1080	if(scale.z > World.m_maxNonphys)
1081	scale.z = 65536.0;	1081	scale.z = World.m_maxNonphys;
1082	LLVector3 tmp = part.Scale;	1082	LLVector3 tmp = part.Scale;
1083	tmp.X = (float)scale.x;	1083	tmp.X = (float)scale.x;
1084	tmp.Y = (float)scale.y;	1084	tmp.Y = (float)scale.y;


diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c597661..79bd6fe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -775,7 +775,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
775	bool allow = true;	775	bool allow = true;
776	foreach(SceneObjectPart part in group.Children.Values)	776	foreach(SceneObjectPart part in group.Children.Values)
777	{	777	{
778	if(part.Scale.X > 10.0 \|\| part.Scale.Y > 10.0 \|\| part.Scale.Z > 10.0)	778	if(part.Scale.X > World.m_maxPhys \|\| part.Scale.Y > World.m_maxPhys \|\| part.Scale.Z > World.m_maxPhys)
779	{	779	{
780	allow = false;	780	allow = false;
781	break;	781	break;
@@ -922,19 +922,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
922		922
923	if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)	923	if(part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
924	{	924	{
925	if(scale.x > 10.0)	925	if(scale.x > World.m_maxPhys)
926	scale.x = 10.0;	926	scale.x = World.m_maxPhys;
927	if(scale.y > 10.0)	927	if(scale.y > World.m_maxPhys)
928	scale.y = 10.0;	928	scale.y = World.m_maxPhys;
929	if(scale.z > 10.0)	929	if(scale.z > World.m_maxPhys)
930	scale.z = 10.0;	930	scale.z = World.m_maxPhys;
931	}	931	}
932	if(scale.x > 65536.0)	932	if(scale.x > World.m_maxNonphys)
933	scale.x = 65536.0;	933	scale.x = World.m_maxNonphys;
934	if(scale.y > 65536.0)	934	if(scale.y > World.m_maxNonphys)
935	scale.y = 65536.0;	935	scale.y = World.m_maxNonphys;
936	if(scale.z > 65536.0)	936	if(scale.z > World.m_maxNonphys)
937	scale.z = 65536.0;	937	scale.z = World.m_maxNonphys;
938	LLVector3 tmp = part.Scale;	938	LLVector3 tmp = part.Scale;
939	tmp.X = (float)scale.x;	939	tmp.X = (float)scale.x;
940	tmp.Y = (float)scale.y;	940	tmp.Y = (float)scale.y;