mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 02:05:34 +08:00
Merged 3Di code that provides scene and avatar serialization, and plugin support for region move/split/merge. See ThirdParty/3Di/README.txt. Unless the new modules are used there should be no noticeable changes when running OpenSim.
This commit is contained in:
@@ -51,6 +51,10 @@ namespace OpenSim.Framework
|
||||
m_remotingPort = ConvertFrom.RemotingPort;
|
||||
m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
|
||||
RemotingAddress = ConvertFrom.RemotingAddress;
|
||||
m_proxyUrl = ConvertFrom.proxyUrl;
|
||||
OriginRegionID = ConvertFrom.originRegionID;
|
||||
RegionName = ConvertFrom.RegionName;
|
||||
ServerURI = ConvertFrom.ServerURI;
|
||||
}
|
||||
|
||||
public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
|
||||
@@ -157,5 +161,57 @@ namespace OpenSim.Framework
|
||||
{
|
||||
get { return Util.UIntsToLong((RegionLocX * (uint)Constants.RegionSize), (RegionLocY * (uint)Constants.RegionSize)); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected string m_proxyUrl;
|
||||
public string ProxyUrl
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_proxyUrl;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_proxyUrl = value;
|
||||
}
|
||||
}
|
||||
|
||||
protected Guid m_originRegionID = LLUUID.Zero.UUID;
|
||||
public LLUUID OriginRegionID
|
||||
{
|
||||
get
|
||||
{
|
||||
return new LLUUID(m_originRegionID);
|
||||
}
|
||||
set
|
||||
{
|
||||
m_originRegionID = value.UUID;
|
||||
}
|
||||
}
|
||||
|
||||
protected string m_regionName;
|
||||
public string RegionName
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_regionName;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_regionName = value;
|
||||
}
|
||||
}
|
||||
|
||||
protected string m_serverURI;
|
||||
public string ServerURI
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_serverURI;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_serverURI = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user