mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 17:55:48 +08:00
* Restarting regions with the estate tools works in sandbox mode. I'm still working on grid mode, however. It doesn't break anything, but that feature doesn't work in grid mode yet either.
This commit is contained in:
@@ -33,6 +33,7 @@ namespace OpenSim.Framework.Communications
|
||||
{
|
||||
bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
|
||||
bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData);
|
||||
bool RegionUp(RegionInfo region);
|
||||
|
||||
bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);
|
||||
bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isFlying);
|
||||
|
||||
@@ -46,6 +46,8 @@ namespace OpenSim.Framework
|
||||
|
||||
public delegate void CloseAgentConnection(ulong regionHandle, LLUUID agentID);
|
||||
|
||||
public delegate bool RegionUp(RegionInfo region);
|
||||
|
||||
|
||||
|
||||
public interface IRegionCommsListener
|
||||
@@ -59,5 +61,7 @@ namespace OpenSim.Framework
|
||||
event AcknowledgePrimCross OnAcknowledgePrimCrossed;
|
||||
event UpdateNeighbours OnNeighboursUpdate;
|
||||
event CloseAgentConnection OnCloseAgentConnection;
|
||||
event RegionUp OnRegionUp;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -30,7 +30,7 @@ using libsecondlife;
|
||||
namespace OpenSim.Framework
|
||||
{
|
||||
public delegate void restart( RegionInfo thisRegion );
|
||||
public delegate void regionup ( RegionInfo thisRegion );
|
||||
//public delegate void regionup ( RegionInfo thisRegion );
|
||||
|
||||
public enum RegionStatus : int
|
||||
{
|
||||
@@ -43,13 +43,12 @@ namespace OpenSim.Framework
|
||||
public interface IScene
|
||||
{
|
||||
event restart OnRestart;
|
||||
event regionup OnRegionUp;
|
||||
|
||||
void AddNewClient(IClientAPI client, bool child);
|
||||
void RemoveClient(LLUUID agentID);
|
||||
|
||||
void Restart(int seconds);
|
||||
void OtherRegionUp(RegionInfo thisRegion);
|
||||
bool OtherRegionUp(RegionInfo thisRegion);
|
||||
|
||||
RegionInfo RegionInfo { get; }
|
||||
uint NextLocalId { get; }
|
||||
|
||||
@@ -42,6 +42,8 @@ namespace OpenSim.Framework
|
||||
public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
|
||||
public event AcknowledgePrimCross OnAcknowledgePrimCrossed;
|
||||
public event CloseAgentConnection OnCloseAgentConnection;
|
||||
public event RegionUp OnRegionUp;
|
||||
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
@@ -68,6 +70,16 @@ namespace OpenSim.Framework
|
||||
return false;
|
||||
}
|
||||
|
||||
public virtual bool TriggerRegionUp(RegionInfo region)
|
||||
{
|
||||
if (OnRegionUp != null)
|
||||
{
|
||||
OnRegionUp(region);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position,
|
||||
bool isFlying)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user