aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs18
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs64
2 files changed, 78 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 7afdd34..d2f74de 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1408,7 +1408,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1408 /// </remarks> 1408 /// </remarks>
1409 private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) 1409 private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
1410 { 1410 {
1411 m_log.Info("[RADMIN]: Received Save OAR Administrator Request"); 1411 m_log.Info("[RADMIN]: Received Save OAR Request");
1412 1412
1413 Hashtable responseData = (Hashtable)response.Value; 1413 Hashtable responseData = (Hashtable)response.Value;
1414 Hashtable requestData = (Hashtable)request.Params[0]; 1414 Hashtable requestData = (Hashtable)request.Params[0];
@@ -1454,8 +1454,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1454 1454
1455 if (archiver != null) 1455 if (archiver != null)
1456 { 1456 {
1457 Guid requestId = Guid.NewGuid();
1457 scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; 1458 scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
1458 archiver.ArchiveRegion(filename, options); 1459
1460 m_log.InfoFormat(
1461 "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}",
1462 scene.Name, filename, requestId);
1463
1464 archiver.ArchiveRegion(filename, requestId, options);
1459 1465
1460 lock (m_saveOarLock) 1466 lock (m_saveOarLock)
1461 Monitor.Wait(m_saveOarLock,5000); 1467 Monitor.Wait(m_saveOarLock,5000);
@@ -1476,12 +1482,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1476 throw e; 1482 throw e;
1477 } 1483 }
1478 1484
1479 m_log.Info("[RADMIN]: Save OAR Administrator Request complete"); 1485 m_log.Info("[RADMIN]: Save OAR Request complete");
1480 } 1486 }
1481 1487
1482 private void RemoteAdminOarSaveCompleted(Guid uuid, string name) 1488 private void RemoteAdminOarSaveCompleted(Guid uuid, string name)
1483 { 1489 {
1484 m_log.DebugFormat("[RADMIN]: File processing complete for {0}", name); 1490 if (name != "")
1491 m_log.ErrorFormat("[RADMIN]: Saving of OAR file with request ID {0} failed with message {1}", uuid, name);
1492 else
1493 m_log.DebugFormat("[RADMIN]: Saved OAR file for request {0}", uuid);
1494
1485 lock (m_saveOarLock) 1495 lock (m_saveOarLock)
1486 Monitor.Pulse(m_saveOarLock); 1496 Monitor.Pulse(m_saveOarLock);
1487 } 1497 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
new file mode 100644
index 0000000..2a1c19c
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -0,0 +1,64 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Text.RegularExpressions;
31using NUnit.Framework;
32using OpenSim.Region.ScriptEngine.Shared.CodeTools;
33using OpenSim.Tests.Common;
34
35namespace OpenSim.Region.ScriptEngine.Shared.Tests
36{
37 public class LSL_EventTests : OpenSimTestCase
38 {
39 [Test]
40 public void TestStateEntryEvent()
41 {
42 TestHelpers.InMethod();
43// TestHelpers.EnableLogging();
44
45 CSCodeGenerator cg = new CSCodeGenerator();
46 cg.Convert("default { state_entry() {} }");
47
48 {
49 bool gotException = false;
50
51 try
52 {
53 cg.Convert("default { state_entry(integer n) {} }");
54 }
55 catch (Exception )
56 {
57 gotException = true;
58 }
59
60 Assert.That(gotException, Is.True);
61 }
62 }
63 }
64} \ No newline at end of file