aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-02 20:59:12 +0000
committerJustin Clarke Casey2009-02-02 20:59:12 +0000
commit2c2f10e156c62aa1d95923ff5309f2be7f08faeb (patch)
treec6631296849e076264ce8e034d29ca117750bfa5 /OpenSim/Region/Environment/Scenes
parent* As per http://opensimulator.org/mantis/view.php?id=3065 (diff)
downloadopensim-SC-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.zip
opensim-SC-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.tar.gz
opensim-SC-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.tar.bz2
opensim-SC-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.tar.xz
* Establish OnOarFileSaved EventManager event and subscribe to that instead of passing in a waithandle to the archiver
* This matches the existing OnOarFileLoaded event * This brings up the question of how these things can be made generic so that they don't have to be tied into EventManager, but that's a topic for another day
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/EventManager.cs16
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs
index 1543bf0..618e6b5 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EventManager.cs
@@ -273,6 +273,13 @@ namespace OpenSim.Region.Environment.Scenes
273 /// </summary> 273 /// </summary>
274 public delegate void OarFileLoaded(string message); 274 public delegate void OarFileLoaded(string message);
275 public event OarFileLoaded OnOarFileLoaded; 275 public event OarFileLoaded OnOarFileLoaded;
276
277 /// <summary>
278 /// Called when an oar file has finished saving
279 /// Message is non empty string if there were problems saving the oar file
280 /// </summary>
281 public delegate void OarFileSaved(string message);
282 public event OarFileSaved OnOarFileSaved;
276 283
277 /// <summary> 284 /// <summary>
278 /// Called when the script compile queue becomes empty 285 /// Called when the script compile queue becomes empty
@@ -415,6 +422,8 @@ namespace OpenSim.Region.Environment.Scenes
415 private OnSetRootAgentSceneDelegate handlerSetRootAgentScene = null; 422 private OnSetRootAgentSceneDelegate handlerSetRootAgentScene = null;
416 423
417 private OarFileLoaded handlerOarFileLoaded = null; 424 private OarFileLoaded handlerOarFileLoaded = null;
425 private OarFileSaved handlerOarFileSaved = null;
426
418 private EmptyScriptCompileQueue handlerEmptyScriptCompileQueue = null; 427 private EmptyScriptCompileQueue handlerEmptyScriptCompileQueue = null;
419 428
420 public void TriggerGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) 429 public void TriggerGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
@@ -925,6 +934,13 @@ namespace OpenSim.Region.Environment.Scenes
925 if (handlerOarFileLoaded != null) 934 if (handlerOarFileLoaded != null)
926 handlerOarFileLoaded(message); 935 handlerOarFileLoaded(message);
927 } 936 }
937
938 public void TriggerOarFileSaved(string message)
939 {
940 handlerOarFileSaved = OnOarFileSaved;
941 if (handlerOarFileSaved != null)
942 handlerOarFileSaved(message);
943 }
928 944
929 public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) 945 public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message)
930 { 946 {