From 63936d442ca7e6bdc0f09a5e974c57b3b5726353 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 15 Apr 2009 19:12:37 +0000
Subject: * Make it possible to add a request id to load and save oar requests
* This allows specific requests to be identified.
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 7496af0..469f139 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -279,14 +279,16 @@ 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(string message);
+ public delegate void OarFileLoaded(Guid guid, string message);
public event OarFileLoaded OnOarFileLoaded;
///
/// Called when an oar file has finished saving
/// Message is non empty string if there were problems saving the oar file
+ /// If a guid was supplied on the original call to identify, the request, this is returned. Otherwise
+ /// Guid.Empty is returned.
///
- public delegate void OarFileSaved(string message);
+ public delegate void OarFileSaved(Guid guid, string message);
public event OarFileSaved OnOarFileSaved;
///
@@ -968,18 +970,18 @@ namespace OpenSim.Region.Framework.Scenes
return 6;
}
- public void TriggerOarFileLoaded(string message)
+ public void TriggerOarFileLoaded(Guid requestId, string message)
{
handlerOarFileLoaded = OnOarFileLoaded;
if (handlerOarFileLoaded != null)
- handlerOarFileLoaded(message);
+ handlerOarFileLoaded(requestId, message);
}
- public void TriggerOarFileSaved(string message)
+ public void TriggerOarFileSaved(Guid requestId, string message)
{
handlerOarFileSaved = OnOarFileSaved;
if (handlerOarFileSaved != null)
- handlerOarFileSaved(message);
+ handlerOarFileSaved(requestId, message);
}
public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message)
--
cgit v1.1