Merge branch 'master' into bigmerge

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

1 files changed, 8 insertions, 8 deletions

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