OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
0.6.0-stable
Tedd Hansen 2008-02-25 11:29:24 +00:00
parent b831a91852
commit 66cc8f99f6
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
View File

@ -105,6 +105,18 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
private void Save() 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); prim.OSSL.llSetPos(Position);
} }
@ -118,11 +130,7 @@ namespace OpenSim.Region.ScriptEngine.Common
set set
{ {
Load(); Load();
Position.x += value; Position.x = value;
if (Position.x > 255)
Position.x = 255;
if (Position.x < 0)
Position.x = 0;
Save(); Save();
} }
} }
@ -136,11 +144,7 @@ namespace OpenSim.Region.ScriptEngine.Common
set set
{ {
Load(); Load();
Position.y += value; Position.y = value;
if (Position.y > 255)
Position.y = 255;
if (Position.y < 0)
Position.y = 0;
Save(); Save();
} }
} }
@ -154,11 +158,7 @@ namespace OpenSim.Region.ScriptEngine.Common
set set
{ {
Load(); Load();
Position.z += value; Position.z = value;
if (Position.z > 255)
Position.z = 255;
if (Position.z < 0)
Position.z = 0;
Save(); Save();
} }
} }
@ -191,7 +191,7 @@ namespace OpenSim.Region.ScriptEngine.Common
set set
{ {
Load(); Load();
Rotation.x += value; Rotation.x = value;
Save(); Save();
} }
} }
@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Common
set set
{ {
Load(); Load();
Rotation.y += value; Rotation.y = value;
Save(); Save();
} }
} }
@ -219,7 +219,7 @@ namespace OpenSim.Region.ScriptEngine.Common
set set
{ {
Load(); Load();
Rotation.z += value; Rotation.z = value;
Save(); Save();
} }
} }
@ -233,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Common
set set
{ {
Load(); Load();
Rotation.s += value; Rotation.s = value;
Save(); Save();
} }
} }

7
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
View File

@ -139,12 +139,13 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
// Construct and initialize settings for a second AppDomain. // Construct and initialize settings for a second AppDomain.
AppDomainSetup ads = new AppDomainSetup(); AppDomainSetup ads = new AppDomainSetup();
ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory; ads.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory;
ads.DisallowBindingRedirects = false; ads.DisallowBindingRedirects = true;
ads.DisallowCodeDownload = true; ads.DisallowCodeDownload = true;
ads.LoaderOptimization = LoaderOptimization.MultiDomain; // Sounds good ;) ads.LoaderOptimization = LoaderOptimization.MultiDomainHost;
ads.ShadowCopyFiles = "true"; // Enabled shadowing ads.ShadowCopyFiles = "false"; // Disable shadowing
ads.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile; ads.ConfigurationFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads); AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + AppDomainNameCount, null, ads);
m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain Loading: " + m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + "]: AppDomain Loading: " +
AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll").ToString()); AssemblyName.GetAssemblyName("OpenSim.Region.ScriptEngine.Common.dll").ToString());