* 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.0.6.0-stable
parent
8cf2630dc9
commit
c6236b5cf3
|
@ -480,6 +480,12 @@ namespace OpenSim.Framework
|
||||||
/// <param name="packType"></param>
|
/// <param name="packType"></param>
|
||||||
string Name { get; }
|
string Name { get; }
|
||||||
|
|
||||||
|
bool IsActive
|
||||||
|
{
|
||||||
|
get;
|
||||||
|
set;
|
||||||
|
}
|
||||||
|
|
||||||
uint CircuitCode { get; }
|
uint CircuitCode { get; }
|
||||||
event ImprovedInstantMessage OnInstantMessage;
|
event ImprovedInstantMessage OnInstantMessage;
|
||||||
event ChatFromViewer OnChatFromViewer;
|
event ChatFromViewer OnChatFromViewer;
|
||||||
|
|
|
@ -14,6 +14,17 @@ namespace OpenSim.Framework
|
||||||
m_y = y;
|
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
|
public int X
|
||||||
{
|
{
|
||||||
get { return m_x; }
|
get { return m_x; }
|
||||||
|
@ -47,11 +58,6 @@ namespace OpenSim.Framework
|
||||||
return X == x && y == Y;
|
return X == x && y == Y;
|
||||||
}
|
}
|
||||||
|
|
||||||
public UInt64 RegionHandle
|
|
||||||
{
|
|
||||||
get { return UInt64.MinValue; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public override int GetHashCode()
|
public override int GetHashCode()
|
||||||
{
|
{
|
||||||
return X.GetHashCode() * 29 + Y.GetHashCode();
|
return X.GetHashCode() * 29 + Y.GetHashCode();
|
||||||
|
|
Loading…
Reference in New Issue