Merge branch 'master' into careminster-presence-refactor

This brings careminster on the level of master. To be tested

1 files changed, 12 insertions, 1 deletions

diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 96a24c6..b7ead6e 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -192,6 +192,11 @@ namespace OpenSim.Client.Sirikata.ClientStack
             get { return isActive; }
             set { isActive = value; }
         }
+        public bool IsLoggingOut
+        {
+            get { return false; }
+            set { }
+        }
 
         public bool SendLogoutPacketWhenClosing
         {
@@ -238,7 +243,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
         public event DeRezObject OnDeRezObject;
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
-        public event GenericCall2 OnCompleteMovementToRegion;
+        public event GenericCall1 OnCompleteMovementToRegion;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
@@ -338,6 +343,8 @@ namespace OpenSim.Client.Sirikata.ClientStack
         public event UUIDNameRequest OnTeleportHomeRequest;
         public event ScriptAnswer OnScriptAnswer;
         public event AgentSit OnUndo;
+        public event AgentSit OnRedo;
+        public event LandUndo OnLandUndo;
         public event ForceReleaseControls OnForceReleaseControls;
         public event GodLandStatRequest OnLandStatRequest;
         public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
@@ -1188,6 +1195,10 @@ namespace OpenSim.Client.Sirikata.ClientStack
         {
         }
 
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
+        {
+        }
+
         #endregion
     }
 }