diff options
author | Adam Frisby | 2008-05-02 16:40:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-02 16:40:17 +0000 |
commit | c6236b5cf3191225f53930736a1b9fca8d012deb (patch) | |
tree | 70532cad92c81b376638129f8d5ec2f0bc6a4bbf /OpenSim/Framework/Location.cs | |
parent | From: Kurt Taylor <krtaylor@us.ibm.com> (diff) | |
download | opensim-SC_OLD-c6236b5cf3191225f53930736a1b9fca8d012deb.zip opensim-SC_OLD-c6236b5cf3191225f53930736a1b9fca8d012deb.tar.gz opensim-SC_OLD-c6236b5cf3191225f53930736a1b9fca8d012deb.tar.bz2 opensim-SC_OLD-c6236b5cf3191225f53930736a1b9fca8d012deb.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Location.cs | 16 |
1 files changed, 11 insertions, 5 deletions
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(); |