From c6236b5cf3191225f53930736a1b9fca8d012deb Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Fri, 2 May 2008 16:40:17 +0000 Subject: * Refactored ClientView into LLClientView. Removed all direct references to UDPServer and replaced with IClientNetworkServer. * This should, in theory, let us make new servers with different protocols very easily (rather than the challenge we would have faced before). * BREAKS LoadBalancing module for the moment. * Commit 1/3 - Please dont attempt to update to this revision until all 3 are in. --- OpenSim/Framework/IClientAPI.cs | 6 ++++++ OpenSim/Framework/Location.cs | 16 +++++++++++----- 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 /// 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 4019a79..a3d504c 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(); -- cgit v1.1