diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 14 |
1 files changed, 8 insertions, 6 deletions
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 | |||
279 | /// the scripts may not have started yet | 279 | /// the scripts may not have started yet |
280 | /// Message is non empty string if there were problems loading the oar file | 280 | /// Message is non empty string if there were problems loading the oar file |
281 | /// </summary> | 281 | /// </summary> |
282 | public delegate void OarFileLoaded(string message); | 282 | public delegate void OarFileLoaded(Guid guid, string message); |
283 | public event OarFileLoaded OnOarFileLoaded; | 283 | public event OarFileLoaded OnOarFileLoaded; |
284 | 284 | ||
285 | /// <summary> | 285 | /// <summary> |
286 | /// Called when an oar file has finished saving | 286 | /// Called when an oar file has finished saving |
287 | /// Message is non empty string if there were problems saving the oar file | 287 | /// Message is non empty string if there were problems saving the oar file |
288 | /// If a guid was supplied on the original call to identify, the request, this is returned. Otherwise | ||
289 | /// Guid.Empty is returned. | ||
288 | /// </summary> | 290 | /// </summary> |
289 | public delegate void OarFileSaved(string message); | 291 | public delegate void OarFileSaved(Guid guid, string message); |
290 | public event OarFileSaved OnOarFileSaved; | 292 | public event OarFileSaved OnOarFileSaved; |
291 | 293 | ||
292 | /// <summary> | 294 | /// <summary> |
@@ -968,18 +970,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
968 | return 6; | 970 | return 6; |
969 | } | 971 | } |
970 | 972 | ||
971 | public void TriggerOarFileLoaded(string message) | 973 | public void TriggerOarFileLoaded(Guid requestId, string message) |
972 | { | 974 | { |
973 | handlerOarFileLoaded = OnOarFileLoaded; | 975 | handlerOarFileLoaded = OnOarFileLoaded; |
974 | if (handlerOarFileLoaded != null) | 976 | if (handlerOarFileLoaded != null) |
975 | handlerOarFileLoaded(message); | 977 | handlerOarFileLoaded(requestId, message); |
976 | } | 978 | } |
977 | 979 | ||
978 | public void TriggerOarFileSaved(string message) | 980 | public void TriggerOarFileSaved(Guid requestId, string message) |
979 | { | 981 | { |
980 | handlerOarFileSaved = OnOarFileSaved; | 982 | handlerOarFileSaved = OnOarFileSaved; |
981 | if (handlerOarFileSaved != null) | 983 | if (handlerOarFileSaved != null) |
982 | handlerOarFileSaved(message); | 984 | handlerOarFileSaved(requestId, message); |
983 | } | 985 | } |
984 | 986 | ||
985 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) | 987 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) |