3 files changed, 20 insertions, 13 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 16dd834..f261c16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -476,9 +476,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         // normalize an angle between -PI and PI (-180 to +180 degrees)
         protected double NormalizeAngle(double angle)
         {
-            angle = angle % (Math.PI * 2);
-            // if (angle < 0) angle = angle + Math.PI * 2;
-            return angle;
+            if (angle > -Math.PI && angle < Math.PI)
+                return angle;
+
+            int numPis = (int)(Math.PI / angle);
+            double remainder = angle - Math.PI * numPis;
+            if (numPis % 2 == 1)
+                return Math.PI - angle;
+            return remainder;
         }
 
         // Old implementation of llRot2Euler, now normalized
@@ -497,9 +502,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                              NormalizeAngle(Math.Atan2(n, Math.Sqrt(p))),
                                              NormalizeAngle(Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s))));
             else if (n > 0)
-                return new LSL_Vector(0.0, Math.PI / 2, NormalizeAngle(Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)));
+                return new LSL_Vector(0.0, Math.PI * 0.5, NormalizeAngle(Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)));
             else
-                return new LSL_Vector(0.0, -Math.PI / 2, NormalizeAngle(Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)));
+                return new LSL_Vector(0.0, -Math.PI * 0.5, NormalizeAngle(Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)));
         }
 
         /* From wiki:
@@ -553,12 +558,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             double x,y,z,s;
 
-            double c1 = Math.Cos(v.x/2.0);
-            double c2 = Math.Cos(v.y/2.0);
-            double c3 = Math.Cos(v.z/2.0);
-            double s1 = Math.Sin(v.x/2.0);
-            double s2 = Math.Sin(v.y/2.0);
-            double s3 = Math.Sin(v.z/2.0);
+            double c1 = Math.Cos(v.x * 0.5);
+            double c2 = Math.Cos(v.y * 0.5);
+            double c3 = Math.Cos(v.z * 0.5);
+            double s1 = Math.Sin(v.x * 0.5);
+            double s2 = Math.Sin(v.y * 0.5);
+            double s3 = Math.Sin(v.z * 0.5);
 
             x = s1*c2*c3+c1*s2*s3;
             y = c1*s2*c3-s1*c2*s3;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index 838cafb..917ca44 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -112,7 +112,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             if (!inits.ContainsKey(api))
                 return;
 
-            ILease lease = (ILease)RemotingServices.GetLifetimeService(data as MarshalByRefObject);
+            //ILease lease = (ILease)RemotingServices.GetLifetimeService(data as MarshalByRefObject);
+            RemotingServices.GetLifetimeService(data as MarshalByRefObject);
 //            lease.Register(m_sponser);
 
             MethodInfo mi = inits[api];
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 225126d..04f7862 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -260,7 +260,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     Path.GetFileNameWithoutExtension(assembly),
                     "SecondLife.Script");
 
-                ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
+                //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
+                RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);                
 //                lease.Register(this);
             }
             catch (Exception)