Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

10 files changed, 120 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index e2bef71..c8990d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,4 +73,20 @@ TAGS
 Makefile.local
 bin/.version
 compile.bat
-
+addon-modules
+OpenSim/Data/Tests/test-results/
+OpenSim/Framework/Serialization/Tests/test-results/
+OpenSim/Framework/Servers/Tests/test-results/
+OpenSim/Framework/Tests/test-results/
+OpenSim/Region/ClientStack/Linden/Caps/test-results/
+OpenSim/Region/ClientStack/Linden/UDP/Tests/test-results/
+OpenSim/Region/CoreModules/test-results/
+OpenSim/Region/Framework/test-results/
+OpenSim/Region/OptionalModules/test-results/
+OpenSim/Region/Physics/BulletDotNETPlugin/
+OpenSim/Region/Physics/Manager/test-results/
+OpenSim/Region/Physics/OdePlugin/Tests/test-results/
+OpenSim/Region/ScriptEngine/test-results/
+OpenSim/Tests/Common/test-results/
+OpenSim/Tests/test-results/
+test-results/
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index 952f039..e26a6f2 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -164,11 +164,7 @@ namespace OpenSim.Framework
                 return m_threads.Remove(threadID);
         }
 
-<<<<<<< HEAD:OpenSim/Framework/Watchdog.cs
-        public static bool RemoveThread(int threadID)
-=======
         public static bool AbortThread(int threadID)
->>>>>>> master:OpenSim/Framework/Watchdog.cs
         {
             lock (m_threads)
             {
@@ -198,14 +194,10 @@ namespace OpenSim.Framework
             try
             {
                 if (m_threads.TryGetValue(threadID, out threadInfo))
-<<<<<<< HEAD:OpenSim/Framework/Watchdog.cs
-                    threadInfo.LastTick = Environment.TickCount;
-=======
                 {
                     threadInfo.LastTick = Environment.TickCount & Int32.MaxValue;
                     threadInfo.IsTimedOut = false;
                 }
->>>>>>> master:OpenSim/Framework/Watchdog.cs
                 else
                 {
                     m_log.WarnFormat("[WATCHDOG]: Asked to update thread {0} which is not being monitored", threadID);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8c7ce24..b2f5279 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1203,7 +1203,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
                 HeartbeatThread.Abort();
-                Watchdog.RemoveThread(HeartbeatThread.ManagedThreadId);
+                Watchdog.AbortThread(HeartbeatThread.ManagedThreadId);
                 HeartbeatThread = null;
             }
             m_lastUpdate = Util.EnvironmentTickCount();
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
index 1bce760..58e2e4c 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -1299,7 +1299,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             if (m_eventsubscription > 0)
             {
-                CollisionEventsThisFrame.addCollider(CollidedWith, contact);
+                CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
             }
         }
 
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 82f1b94..5f802d0 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -2438,7 +2438,7 @@ Console.WriteLine("ODEPrim JointCreateFixed !!!");
         {
             if (CollisionEventsThisFrame == null)
                 CollisionEventsThisFrame = new CollisionEventUpdate();
-            CollisionEventsThisFrame.addCollider(CollidedWith, contact);
+            CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
         }
 
         public void SendCollisions()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0e0c2b7..e53fd5d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3648,12 +3648,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llTargetOmega(LSL_Vector axis, double spinrate, double gain)
         {
             m_host.AddScriptLPS(1);
-            m_host.AngularVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate));
-            m_host.ScheduleTerseUpdate();
-            m_host.SendTerseUpdateToAllClients();
-            m_host.ParentGroup.HasGroupChanged = true;
+            TargetOmega(m_host, axis, spinrate, gain);
         }
 
+        protected void TargetOmega(SceneObjectPart part, LSL_Vector axis, double spinrate, double gain)
+        {
+            part.AngularVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate));
+            part.ScheduleTerseUpdate();
+            part.SendTerseUpdateToAllClients();
+            part.ParentGroup.HasGroupChanged = true;
+         }
+
         public LSL_Integer llGetStartParameter()
         {
             m_host.AddScriptLPS(1);
@@ -7936,6 +7941,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         LSL_Rotation lr = rules.GetQuaternionItem(idx++);
                         SetRot(part, Rot2Quaternion(lr));
                         break;
+                    case (int)ScriptBaseClass.PRIM_OMEGA:
+                        if (remain < 3)
+                            return;
+                        LSL_Vector axis = rules.GetVector3Item(idx++);
+                        LSL_Float spinrate = rules.GetLSLFloatItem(idx++);
+                        LSL_Float gain = rules.GetLSLFloatItem(idx++);
+                        TargetOmega(part, axis, (double)spinrate, (double)gain);
+                        break;
+                    case (int)ScriptBaseClass.PRIM_LINK_TARGET:
+                        if (remain < 1)
+                            return;
+                        LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++);
+                        part = part.ParentGroup.GetLinkNumPart((int)new_linknumber);
+                        break;
                 }
             }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index ed2f221..ab0eec9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -113,11 +113,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     {
         public List<UUID> AllowedCreators;
         public List<UUID> AllowedOwners;
+        public List<string> AllowedOwnerClasses;
 
         public FunctionPerms()
         {
             AllowedCreators = new List<UUID>();
             AllowedOwners = new List<UUID>();
+            AllowedOwnerClasses = new List<string>();
         }
     }
 
@@ -254,6 +256,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     // Default behavior
                     perms.AllowedOwners = null;
                     perms.AllowedCreators = null;
+                    perms.AllowedOwnerClasses = null;
                 }
                 else
                 {
@@ -274,12 +277,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         foreach (string id in ids)
                         {
                             string current = id.Trim();
-                            UUID uuid;
-
-                            if (UUID.TryParse(current, out uuid))
+                            if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER")
                             {
-                                if (uuid != UUID.Zero)
-                                    perms.AllowedOwners.Add(uuid);
+                                if (!perms.AllowedOwnerClasses.Contains(current))
+                                    perms.AllowedOwnerClasses.Add(current.ToUpper());
+                            }
+                            else
+                            {
+                                UUID uuid;
+
+                                if (UUID.TryParse(current, out uuid))
+                                {
+                                    if (uuid != UUID.Zero)
+                                        perms.AllowedOwners.Add(uuid);
+                                }
                             }
                         }
 
@@ -335,11 +346,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             String.Format("{0} permission error. Can't find script in prim inventory.",
                             function));
                     }
+
+                    UUID ownerID = ti.OwnerID;
+
+                    //OSSL only may be used if objet is in the same group as the parcel
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER"))
+                    {
+                        ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
+
+                        if (land.LandData.GroupID == ti.GroupID && land.LandData.GroupID != UUID.Zero)
+                        {
+                            return;
+                        }
+                    }
+
+                    //Only Parcelowners may use the function
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_OWNER"))
+                    {
+                        ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
+
+                        if (land.LandData.OwnerID == ownerID)
+                        {
+                            return;
+                        }
+                    }
+
+                    //Only Estate Managers may use the function
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_MANAGER"))
+                    {
+                        //Only Estate Managers may use the function
+                        if (World.RegionInfo.EstateSettings.IsEstateManager(ownerID) && World.RegionInfo.EstateSettings.EstateOwner != ownerID)
+                        {
+                            return;
+                        }
+                    }
+
+                    //Only regionowners may use the function
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_OWNER"))
+                    {
+                        if (World.RegionInfo.EstateSettings.EstateOwner == ownerID)
+                        {
+                            return;
+                        }
+                    }
+
                     if (!m_FunctionPerms[function].AllowedCreators.Contains(ti.CreatorID))
                         OSSLError(
                             String.Format("{0} permission denied. Script creator is not in the list of users allowed to execute this function and prim owner also has no permission.",
                             function));
-                    if (ti.CreatorID != ti.OwnerID)
+                    if (ti.CreatorID != ownerID)
                     {
                         if ((ti.CurrentPermissions & (uint)PermissionMask.Modify) != 0)
                             OSSLError(
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 3af9911..a1cf3df 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -322,6 +322,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PRIM_NAME = 27;
         public const int PRIM_DESC = 28;
         public const int PRIM_ROT_LOCAL = 29;
+        public const int PRIM_OMEGA = 32;
+        public const int PRIM_LINK_TARGET = 34;
         public const int PRIM_TEXGEN_DEFAULT = 0;
         public const int PRIM_TEXGEN_PLANAR = 1;
 
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 44da31c..80f4c0e 100644..100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -617,6 +617,13 @@
     
     ; Comma separated list of UUIDS allows the function for that list of UUIDS
     ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+    
+    ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are
+    ; - PARCEL_GROUP_MEMBER: allow if objectgroup is the same group as the parcel
+    ; - PARCEL_OWNER: allow if the objectowner is parcelowner
+    ; - ESTATE_MANAGER: allow if the object owner is a estate manager
+    ; - ESTATE_OWNER: allow if objectowner is estateowner
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ...
 
     ; You can also use script creators as the uuid
     ; Creators_osSetRegionWaterHeight = <uuid>, ...
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 306c17f..de2f787 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1196,6 +1196,13 @@
 
     ; Comma separated list of UUIDS allows the function for that list of UUIDS
     ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+    
+    ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are
+    ; - PARCEL_GROUP_MEMBER: allow if objectgroup is the same group as the parcel
+    ; - PARCEL_OWNER: allow if the objectowner is parcelowner
+    ; - ESTATE_MANAGER: allow if the object owner is a estate manager
+    ; - ESTATE_OWNER: allow if objectowner is estateowner
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ...
 
     ; You can also use script creators as the uuid
     ; Creators_osSetRegionWaterHeight = <uuid>, ...