ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2012-06-07 23:34:22 +01:00
parent e8cd9fbbb7 4942314435
commit 69dd5b855a
67 changed files with 467 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -61,6 +61,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
public event ChangeDelegate OnEstateInfoChange;
public event MessageDelegate OnEstateMessage;
private int m_delayCount = 0;
#region Packet Data Responders
private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice)
@@ -270,7 +272,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
{
if (timeInSeconds == -1)
{
restartModule.AbortRestart("Restart aborted by region manager");
m_delayCount++;
if (m_delayCount > 3)
return;
restartModule.DelayRestart(3600, "Restart delayed by region manager");
return;
}