diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 9bcd65f5ca..8f41728366 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -480,6 +480,12 @@ namespace OpenSim.Framework
         /// <param name="packType"></param>
         string Name { get; }
 
+        bool IsActive
+        {
+            get;
+            set;
+        }
+
         uint CircuitCode { get; }
         event ImprovedInstantMessage OnInstantMessage;
         event ChatFromViewer OnChatFromViewer;
diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index 4019a7913b..a3d504c88d 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -14,6 +14,17 @@ namespace OpenSim.Framework
             m_y = y;
         }
 
+        public Location(ulong regionHandle)
+        {
+            m_x = (int) regionHandle;
+            m_y = (int) (regionHandle >> 32);
+        }
+
+        public ulong RegionHandle
+        {
+            get { return ((ulong) m_x << 32 & (ulong) m_y); }
+        }
+
         public int X
         {
             get { return m_x; }
@@ -47,11 +58,6 @@ namespace OpenSim.Framework
             return X == x && y == Y;
         }
 
-        public UInt64 RegionHandle
-        {
-            get { return UInt64.MinValue; }
-        }
-
         public override int GetHashCode()
         {
             return X.GetHashCode() * 29 + Y.GetHashCode();