diff options
author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
---|---|---|
committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 7424b24..753344d 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -290,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
290 | /// Guid.Empty is returned. | 290 | /// Guid.Empty is returned. |
291 | /// </summary> | 291 | /// </summary> |
292 | public delegate void OarFileSaved(Guid guid, string message); | 292 | public delegate void OarFileSaved(Guid guid, string message); |
293 | public event OarFileSaved OnOarFileSaved; | 293 | public event OarFileSaved OnOarFileSaved; |
294 | 294 | ||
295 | /// <summary> | 295 | /// <summary> |
296 | /// Called when the script compile queue becomes empty | 296 | /// Called when the script compile queue becomes empty |
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1004 | handlerOarFileSaved = OnOarFileSaved; | 1004 | handlerOarFileSaved = OnOarFileSaved; |
1005 | if (handlerOarFileSaved != null) | 1005 | if (handlerOarFileSaved != null) |
1006 | handlerOarFileSaved(requestId, message); | 1006 | handlerOarFileSaved(requestId, message); |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) | 1009 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) |
1010 | { | 1010 | { |