mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 09:45:47 +08:00
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
using System;
|
||||
using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using libsecondlife;
|
||||
using OpenMetaverse;
|
||||
|
||||
namespace OpenSim.Framework
|
||||
{
|
||||
@@ -47,14 +47,14 @@ namespace OpenSim.Framework
|
||||
protected uint m_httpPort = 9000;
|
||||
|
||||
protected IPEndPoint m_internalEndPoint;
|
||||
protected Guid m_originRegionID = LLUUID.Zero.UUID;
|
||||
protected Guid m_originRegionID = UUID.Zero.Guid;
|
||||
protected string m_proxyUrl;
|
||||
protected uint? m_regionLocX;
|
||||
protected uint? m_regionLocY;
|
||||
protected string m_regionName;
|
||||
public uint m_remotingPort;
|
||||
protected string m_serverURI;
|
||||
public Guid RegionID = LLUUID.Zero.UUID;
|
||||
public Guid RegionID = UUID.Zero.Guid;
|
||||
public string RemotingAddress;
|
||||
|
||||
/// <summary>
|
||||
@@ -181,10 +181,10 @@ namespace OpenSim.Framework
|
||||
set { m_proxyUrl = value; }
|
||||
}
|
||||
|
||||
public LLUUID OriginRegionID
|
||||
public UUID OriginRegionID
|
||||
{
|
||||
get { return new LLUUID(m_originRegionID); }
|
||||
set { m_originRegionID = value.UUID; }
|
||||
get { return new UUID(m_originRegionID); }
|
||||
set { m_originRegionID = value.Guid; }
|
||||
}
|
||||
|
||||
public string RegionName
|
||||
@@ -199,4 +199,4 @@ namespace OpenSim.Framework
|
||||
set { m_serverURI = value; }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user