ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

This update has good news and bad news, first the bad.

Browse Source 
* This update breaks inter-region communications, sorry.
* You will need to run prebuild.
Next, the good;
* This update solves the unexpected binary element when Linux simulators inform windows simulators and vice versa.  So Linux Simulators and Windows simulators are 100% compatible again.
* This update introduces an Integer in the prim crossing method to tell the receiving simulator which XML method to use to load the prim that crossed the border.   If the receiving prim doesn't support the method, the prim crossing fails and no prims are lost.
That being said, it's best to update all your simulators to this revision at once.
This commit is contained in:
Teravus Ovares
2008-03-30 08:01:47 +00:00
parent 2fddd775f4
commit fd2caf5f16
13 changed files with 155 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/IInterRegionCommunications.cs
View File

@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Communications
bool Available { get; }
void CheckRegion(string address, uint port);
bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData);
bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod);
bool RegionUp(SearializableRegionInfo region, ulong regionhandle);
bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);

8
OpenSim/Framework/IClientAPI.cs
View File

@@ -302,6 +302,13 @@ namespace OpenSim.Framework
public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, LLUUID GroupID);
public delegate void ObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID,
LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart,
bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates);
public delegate void StatusChange(bool status);
public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
@@ -463,6 +470,7 @@ namespace OpenSim.Framework
event GodKickUser OnGodKickUser;
event ObjectDuplicate OnObjectDuplicate;
event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
event UpdateVector OnGrabObject;
event ObjectSelect OnDeGrabObject;
event MoveObject OnGrabUpdate;

2
OpenSim/Framework/IRegionCommsListener.cs
View File

@@ -32,7 +32,7 @@ namespace OpenSim.Framework
{
public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
public delegate void ExpectPrimDelegate(ulong regionHandle, LLUUID primID, string objData);
public delegate bool ExpectPrimDelegate(ulong regionHandle, LLUUID primID, string objData, int XMLMethod);
public delegate void UpdateNeighbours(List<RegionInfo> neighbours);

4
OpenSim/Framework/RegionCommsListener.cs
View File

@@ -78,12 +78,12 @@ namespace OpenSim.Framework
}
public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
{
handlerExpectPrim = OnExpectPrim;
if (handlerExpectPrim != null)
{
handlerExpectPrim(regionHandle, primID, objData);
handlerExpectPrim(regionHandle, primID, objData, XMLMethod);
return true;
}
return false;

17
OpenSim/Framework/RegionInfo.cs
View File

@@ -101,6 +101,12 @@ namespace OpenSim.Framework
public bool m_allow_alternate_ports;
protected string m_serverURI;
public int getInternalEndPointPort()
{
return m_internalEndPoint.Port;
}
public string ServerURI
{
get
@@ -279,6 +285,17 @@ namespace OpenSim.Framework
RegionID = LLUUID.Zero;
ServerURI = ConvertFrom.ServerURI;
}
public int getInternalEndPointPort()
{
return m_internalEndPoint.Port;
}
public void SetEndPoint(string ipaddr, int port)
{
IPAddress tmpIP = IPAddress.Parse(ipaddr);
IPEndPoint tmpEPE= new IPEndPoint(tmpIP, port);
m_internalEndPoint = tmpEPE;
}
//not in use, should swap to nini though.
public void LoadFromNiniSource(IConfigSource source)

40
OpenSim/Framework/RegionUpData.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{
[Serializable]
public class RegionUpData
{
private uint m_X = 0;
private uint m_Y = 0;
private string m_ipaddr = "";
private int m_port = 0;
public RegionUpData(uint X, uint Y, string ipaddr, int port)
{
m_X = X;
m_Y = Y;
m_ipaddr = ipaddr;
m_port = port;
}
public uint X
{
get { return m_X; }
}
public uint Y
{
get { return m_Y; }
}
public string IPADDR
{
get { return m_ipaddr; }
}
public int PORT
{
get { return m_port; }
}
}
}