From 66cc8f99f67c2fd4679a4501bee6f008d80eae69 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Mon, 25 Feb 2008 11:29:24 +0000 Subject: [PATCH] I'm the stupidest stupid in the whole world. :) Fixed a bug in new Prim where I actually ADDED new values to old values instead of directly assigning them... Now that was a waste of time! :P --- .../Common/OSSL_BuilIn_Commands.cs | 38 +++++++++---------- .../ScriptEngineBase/AppDomainManager.cs | 7 ++-- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index 08f600953a..27b3050e61 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs @@ -105,6 +105,18 @@ namespace OpenSim.Region.ScriptEngine.Common } private void Save() { + if (Position.x > 255) + Position.x = 255; + if (Position.x < 0) + Position.x = 0; + if (Position.y > 255) + Position.y = 255; + if (Position.y < 0) + Position.y = 0; + if (Position.z > 768) + Position.z = 768; + if (Position.z < 0) + Position.z = 0; prim.OSSL.llSetPos(Position); } @@ -118,11 +130,7 @@ namespace OpenSim.Region.ScriptEngine.Common set { Load(); - Position.x += value; - if (Position.x > 255) - Position.x = 255; - if (Position.x < 0) - Position.x = 0; + Position.x = value; Save(); } } @@ -136,11 +144,7 @@ namespace OpenSim.Region.ScriptEngine.Common set { Load(); - Position.y += value; - if (Position.y > 255) - Position.y = 255; - if (Position.y < 0) - Position.y = 0; + Position.y = value; Save(); } } @@ -154,11 +158,7 @@ namespace OpenSim.Region.ScriptEngine.Common set { Load(); - Position.z += value; - if (Position.z > 255) - Position.z = 255; - if (Position.z < 0) - Position.z = 0; + Position.z = value; Save(); } } @@ -191,7 +191,7 @@ namespace OpenSim.Region.ScriptEngine.Common set { Load(); - Rotation.x += value; + Rotation.x = value; Save(); } } @@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Common set { Load(); - Rotation.y += value; + Rotation.y = value; Save(); } } @@ -219,7 +219,7 @@ namespace OpenSim.Region.ScriptEngine.Common set { Load(); - Rotation.z += value; + Rotation.z = value; Save(); } } @@ -233,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Common set { Load(); - Rotation.s += value; + Rotation.s = value; Save(); } } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs index 23dec6ab03..cac3256b7a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs @@ -139,12 +139,13 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase // Construct and initialize settings for a second AppDomain. AppDomainSetup ads = new AppDomainSetup(); ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory; - ads.DisallowBindingRedirects = false; + ads.DisallowBindingRedirects = true; ads.DisallowCodeDownload = true; - ads.LoaderOptimization = LoaderOptimization.MultiDomain; // Sounds good ;) - ads.ShadowCopyFiles = "true"; // Enabled shadowing + ads.LoaderOptimization = LoaderOptimization.MultiDomainHost; + ads.ShadowCopyFiles = "false"; // Disable shadowing ads.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; + AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads); m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain Loading: " + AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll").ToString());