From ce468215d576cc301a261d85bee9baa68a246ce6 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 24 Jul 2012 19:48:08 +0300
Subject: Support multi-region OAR files
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
---
OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 5 +++++
OpenSim/Region/Framework/Scenes/EventManager.cs | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 15cd238..1983984 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -46,6 +46,11 @@ namespace OpenSim.Region.Framework.Interfaces
///
void sendRegionHandshakeToAll();
+ ///
+ /// Fires the OnRegionInfoChange event.
+ ///
+ void TriggerRegionInfoChange();
+
void setEstateTerrainBaseTexture(int level, UUID texture);
void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue);
}
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 2f34785..e1c9c8e 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -531,7 +531,7 @@ namespace OpenSim.Region.Framework.Scenes
/// the scripts may not have started yet
/// Message is non empty string if there were problems loading the oar file
///
- public delegate void OarFileLoaded(Guid guid, string message);
+ public delegate void OarFileLoaded(Guid guid, List loadedScenes, string message);
public event OarFileLoaded OnOarFileLoaded;
///
@@ -2195,7 +2195,7 @@ namespace OpenSim.Region.Framework.Scenes
return 6;
}
- public void TriggerOarFileLoaded(Guid requestId, string message)
+ public void TriggerOarFileLoaded(Guid requestId, List loadedScenes, string message)
{
OarFileLoaded handlerOarFileLoaded = OnOarFileLoaded;
if (handlerOarFileLoaded != null)
@@ -2204,7 +2204,7 @@ namespace OpenSim.Region.Framework.Scenes
{
try
{
- d(requestId, message);
+ d(requestId, loadedScenes, message);
}
catch (Exception e)
{
--
cgit v1.1
From 5dd2569bf7d50217d1786c3268a537745b2e9fd3 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 27 Aug 2012 12:47:04 +0300
Subject: Added unit tests for multi-region OARs
---
OpenSim/Region/Framework/Scenes/SceneManager.cs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c81b55d..cb5b2ba 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -92,7 +92,11 @@ namespace OpenSim.Region.Framework.Scenes
private static SceneManager m_instance = null;
public static SceneManager Instance
{
- get { return m_instance; }
+ get {
+ if (m_instance == null)
+ m_instance = new SceneManager();
+ return m_instance;
+ }
}
private readonly List m_localScenes = new List();
--
cgit v1.1