aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs6
-rw-r--r--OpenSim/Framework/Location.cs16
2 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 9bcd65f..8f41728 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -480,6 +480,12 @@ namespace OpenSim.Framework
480 /// <param name="packType"></param> 480 /// <param name="packType"></param>
481 string Name { get; } 481 string Name { get; }
482 482
483 bool IsActive
484 {
485 get;
486 set;
487 }
488
483 uint CircuitCode { get; } 489 uint CircuitCode { get; }
484 event ImprovedInstantMessage OnInstantMessage; 490 event ImprovedInstantMessage OnInstantMessage;
485 event ChatFromViewer OnChatFromViewer; 491 event ChatFromViewer OnChatFromViewer;
diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index 4019a79..a3d504c 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -14,6 +14,17 @@ namespace OpenSim.Framework
14 m_y = y; 14 m_y = y;
15 } 15 }
16 16
17 public Location(ulong regionHandle)
18 {
19 m_x = (int) regionHandle;
20 m_y = (int) (regionHandle >> 32);
21 }
22
23 public ulong RegionHandle
24 {
25 get { return ((ulong) m_x << 32 & (ulong) m_y); }
26 }
27
17 public int X 28 public int X
18 { 29 {
19 get { return m_x; } 30 get { return m_x; }
@@ -47,11 +58,6 @@ namespace OpenSim.Framework
47 return X == x && y == Y; 58 return X == x && y == Y;
48 } 59 }
49 60
50 public UInt64 RegionHandle
51 {
52 get { return UInt64.MinValue; }
53 }
54
55 public override int GetHashCode() 61 public override int GetHashCode()
56 { 62 {
57 return X.GetHashCode() * 29 + Y.GetHashCode(); 63 return X.GetHashCode() * 29 + Y.GetHashCode();