Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

5 files changed, 252 insertions, 36 deletions

diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
new file mode 100644
index 0000000..9a9371d
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenMetaverse;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using pCampBot.Interfaces;
+
+namespace pCampBot
+{
+    public class AbstractBehaviour : IBehaviour
+    {
+        public string Name { get; protected set; }
+
+        public Bot Bot { get; protected set; }
+
+        public virtual void Action() {}
+
+        public virtual void Initialize(Bot bot)
+        {
+            Bot = bot;
+        }
+    }
+}
diff --git a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
new file mode 100644
index 0000000..1e01c64
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using pCampBot.Interfaces;
+
+namespace pCampBot
+{
+    /// <summary>
+    /// Get the bot to make a region crossing.
+    /// </summary>
+    public class CrossBehaviour : AbstractBehaviour
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public AutoResetEvent m_regionCrossedMutex = new AutoResetEvent(false);
+
+        public const int m_regionCrossingTimeout = 1000 * 60;
+
+        public CrossBehaviour() { Name = "Cross"; }
+
+        public override void Action()
+        {
+            GridClient client = Bot.Client;
+
+//            // Fly to make the border cross easier.
+//            client.Self.Movement.Fly = true;
+//            client.Self.Movement.Fly = false;
+
+            // Seek out neighbouring region
+            Simulator currentSim = client.Network.CurrentSim;
+            ulong currentHandle = currentSim.Handle;
+            uint currentX, currentY;
+            Utils.LongToUInts(currentHandle, out currentX, out currentY);
+
+            List<GridRegion> candidateRegions = new List<GridRegion>();
+            TryAddRegion(Utils.UIntsToLong(Math.Max(0, currentX - Constants.RegionSize), currentY), candidateRegions); // West
+            TryAddRegion(Utils.UIntsToLong(currentX + Constants.RegionSize, currentY), candidateRegions);              // East
+            TryAddRegion(Utils.UIntsToLong(currentX, Math.Max(0, currentY - Constants.RegionSize)), candidateRegions); // South
+            TryAddRegion(Utils.UIntsToLong(currentX, currentY + Constants.RegionSize), candidateRegions);              // North
+
+            if (candidateRegions.Count != 0)
+            {
+                GridRegion destRegion = candidateRegions[Bot.Manager.Rng.Next(candidateRegions.Count)];
+
+                uint targetX, targetY;
+                Utils.LongToUInts(destRegion.RegionHandle, out targetX, out targetY);
+
+                Vector3 pos = client.Self.SimPosition;
+                if (targetX < currentX)
+                    pos.X = -1;
+                else if (targetX > currentX)
+                    pos.X = Constants.RegionSize + 1;
+
+                if (targetY < currentY)
+                    pos.Y = -1;
+                else if (targetY > currentY)
+                    pos.Y = Constants.RegionSize + 1;
+
+                m_log.DebugFormat(
+                    "[CROSS BEHAVIOUR]: {0} moving to cross from {1} into {2}, target {3}",
+                    Bot.Name, currentSim.Name, destRegion.Name, pos);
+
+                // Face in the direction of the candidate region
+                client.Self.Movement.TurnToward(pos);
+
+                // Listen for event so that we know when we've crossed the region boundary
+                Bot.Client.Self.RegionCrossed += Self_RegionCrossed;
+
+                // Start moving
+                Bot.Client.Self.Movement.AtPos = true;
+
+                // Stop when reach region target or border cross detected
+                if (!m_regionCrossedMutex.WaitOne(m_regionCrossingTimeout))
+                {
+                    m_log.ErrorFormat(
+                        "[CROSS BEHAVIOUR]: {0} failed to cross from {1} into {2} with {3}ms",
+                        Bot.Name, currentSim.Name, destRegion.Name, m_regionCrossingTimeout);
+                }
+                else
+                {
+                    m_log.DebugFormat(
+                        "[CROSS BEHAVIOUR]: {0} crossed from {1} into {2}",
+                        Bot.Name, currentSim.Name, destRegion.Name);
+                }
+
+                Bot.Client.Self.RegionCrossed -= Self_RegionCrossed;
+
+                // We will hackishly carry on travelling into the region for a little bit.
+                Thread.Sleep(6000);
+
+                m_log.DebugFormat(
+                    "[CROSS BEHAVIOUR]: {0} stopped moving after cross from {1} into {2}",
+                    Bot.Name, currentSim.Name, destRegion.Name);
+
+                Bot.Client.Self.Movement.AtPos = false;
+            }
+            else
+            {
+                m_log.DebugFormat(
+                    "[CROSS BEHAVIOUR]: No candidate region for {0} to cross into from {1}.  Ignoring.",
+                    Bot.Name, currentSim.Name);
+            }
+        }
+
+        private bool TryAddRegion(ulong handle, List<GridRegion> regions)
+        {
+            Dictionary<ulong, GridRegion> knownRegions = Bot.Manager.RegionsKnown;
+
+            lock (knownRegions)
+            {
+                if (knownRegions.Count == 0)
+                    return false;
+
+                m_log.DebugFormat("[CROSS BEHAVIOUR]: Looking for region with handle {0} in known regions", handle);
+
+                if (knownRegions.ContainsKey(handle))
+                {
+                    GridRegion region = knownRegions[handle];
+                    m_log.DebugFormat(
+                        "[CROSS BEHAVIOUR]: Adding region {0} to crossing candidates for {1}", region.Name, Bot.Name);
+
+                    regions.Add(region);
+
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        internal void Self_RegionCrossed(object o, RegionCrossedEventArgs args)
+        {
+            m_regionCrossedMutex.Set();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 0a6d5d2..6ad02b2 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -39,20 +39,20 @@ namespace pCampBot
     /// <remarks>
     /// The viewer itself does not give the option of grabbing objects that haven't been signalled as grabbable.
     /// </remarks>
-    public class GrabbingBehaviour : IBehaviour
+    public class GrabbingBehaviour : AbstractBehaviour
     {
-        public string Name { get { return "Grabbing"; } }
+        public GrabbingBehaviour() { Name = "Grabbing"; }
 
-        public void Action(Bot bot)
+        public override void Action()
         {
-            Dictionary<UUID, Primitive> objects = bot.Objects;
+            Dictionary<UUID, Primitive> objects = Bot.Objects;
 
-            Primitive prim = objects.ElementAt(bot.Random.Next(0, objects.Count)).Value;
+            Primitive prim = objects.ElementAt(Bot.Random.Next(0, objects.Count)).Value;
 
             // This appears to be a typical message sent when a viewer user clicks a clickable object
-            bot.Client.Self.Grab(prim.LocalID);
-            bot.Client.Self.GrabUpdate(prim.ID, Vector3.Zero);
-            bot.Client.Self.DeGrab(prim.LocalID);
+            Bot.Client.Self.Grab(prim.LocalID);
+            Bot.Client.Self.GrabUpdate(prim.ID, Vector3.Zero);
+            Bot.Client.Self.DeGrab(prim.LocalID);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index f782bb5..daa7485 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -40,43 +40,41 @@ namespace pCampBot
     /// <remarks>
     /// TODO: talkarray should be in a separate behaviour.
     /// </remarks>
-    public class PhysicsBehaviour : IBehaviour
+    public class PhysicsBehaviour : AbstractBehaviour
     {
-        public string Name { get { return "Physics"; } }
-
         private string[] talkarray;
 
         public PhysicsBehaviour()
         {
+            Name = "Physics";
             talkarray = readexcuses();
         }
 
-        public void Action(Bot bot)
+        public override void Action()
         {
-            int walkorrun = bot.Random.Next(4); // Randomize between walking and running. The greater this number,
+            int walkorrun = Bot.Random.Next(4); // Randomize between walking and running. The greater this number,
                                                 // the greater the bot's chances to walk instead of run.
-            bot.Client.Self.Jump(false);
+            Bot.Client.Self.Jump(false);
             if (walkorrun == 0)
             {
-                bot.Client.Self.Movement.AlwaysRun = true;
+                Bot.Client.Self.Movement.AlwaysRun = true;
             }
             else
             {
-                bot.Client.Self.Movement.AlwaysRun = false;
+                Bot.Client.Self.Movement.AlwaysRun = false;
             }
 
             // TODO: unused: Vector3 pos = client.Self.SimPosition;
-            Vector3 newpos = new Vector3(bot.Random.Next(1, 254), bot.Random.Next(1, 254), bot.Random.Next(1, 254));
-            bot.Client.Self.Movement.TurnToward(newpos);
-
-            bot.Client.Self.Movement.AtPos = true;
-            Thread.Sleep(bot.Random.Next(3000, 13000));
-            bot.Client.Self.Movement.AtPos = false;
-            bot.Client.Self.Jump(true);
+            Vector3 newpos = new Vector3(Bot.Random.Next(1, 254), Bot.Random.Next(1, 254), Bot.Random.Next(1, 254));
+            Bot.Client.Self.Movement.TurnToward(newpos);
 
-            string randomf = talkarray[bot.Random.Next(talkarray.Length)];
+            Bot.Client.Self.Movement.AtPos = true;
+            Thread.Sleep(Bot.Random.Next(3000, 13000));
+            Bot.Client.Self.Movement.AtPos = false;
+            Bot.Client.Self.Jump(true);
+            string randomf = talkarray[Bot.Random.Next(talkarray.Length)];
             if (talkarray.Length > 1 && randomf.Length > 1)
-                bot.Client.Self.Chat(randomf, 0, ChatType.Normal);
+                Bot.Client.Self.Chat(randomf, 0, ChatType.Normal);
         }
 
         private string[] readexcuses()
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index fc2ed2c..fbb4e96 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
@@ -38,38 +38,38 @@ namespace pCampBot
     /// <summary>
     /// Teleport to a random region on the grid.
     /// </summary>
-    public class TeleportBehaviour : IBehaviour
+    public class TeleportBehaviour : AbstractBehaviour
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public string Name { get { return "Teleport"; } }
+        public TeleportBehaviour() { Name = "Teleport"; }
 
-        public void Action(Bot bot)
+        public override void Action()
         {
-            Random rng = bot.Manager.Rng;
+            Random rng = Bot.Manager.Rng;
             GridRegion[] knownRegions;
 
-            lock (bot.Manager.RegionsKnown)
+            lock (Bot.Manager.RegionsKnown)
             {
-                if (bot.Manager.RegionsKnown.Count == 0)
+                if (Bot.Manager.RegionsKnown.Count == 0)
                 {
                     m_log.DebugFormat(
-                        "[TELEPORT BEHAVIOUR]: Ignoring teleport action for {0} since no regions are known yet", bot.Name);
+                        "[TELEPORT BEHAVIOUR]: Ignoring teleport action for {0} since no regions are known yet", Bot.Name);
                     return;
                 }
 
-                knownRegions = bot.Manager.RegionsKnown.Values.ToArray();
+                knownRegions = Bot.Manager.RegionsKnown.Values.ToArray();
             }
 
-            Simulator sourceRegion = bot.Client.Network.CurrentSim;
+            Simulator sourceRegion = Bot.Client.Network.CurrentSim;
             GridRegion destRegion = knownRegions[rng.Next(knownRegions.Length)];
             Vector3 destPosition = new Vector3(rng.Next(255), rng.Next(255), 50);
 
             m_log.DebugFormat(
                 "[TELEPORT BEHAVIOUR]: Teleporting {0} from {1} {2} to {3} {4}",
-                bot.Name, sourceRegion.Name, bot.Client.Self.SimPosition, destRegion.Name, destPosition);
+                Bot.Name, sourceRegion.Name, Bot.Client.Self.SimPosition, destRegion.Name, destPosition);
 
-            bot.Client.Self.Teleport(destRegion.RegionHandle, destPosition);
+            Bot.Client.Self.Teleport(destRegion.RegionHandle, destPosition);
         }
     }
 }
\ No newline at end of file