aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorDiva Canto2009-08-17 05:55:38 -0700
committerDiva Canto2009-08-17 05:55:38 -0700
commitfa8a94577a2f38145da0c8a1f6d1c72c4f339ed9 (patch)
tree7bee741b06e6732fae848bef3c6b7f808ab3349a /OpenSim/Region/ScriptEngine
parentBumped up grid services interface number. (diff)
parentAdd System.Xml reference to the console project (diff)
downloadopensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.zip
opensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.tar.gz
opensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.tar.bz2
opensim-SC_OLD-fa8a94577a2f38145da0c8a1f6d1c72c4f339ed9.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs16
2 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index f290dd7..358ce22 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -35,6 +35,7 @@ using Nini.Config;
35using OpenSim.Region.ScriptEngine.Shared.Api; 35using OpenSim.Region.ScriptEngine.Shared.Api;
36using OpenMetaverse; 36using OpenMetaverse;
37using System; 37using System;
38using OpenSim.Tests.Common.Mock;
38 39
39namespace OpenSim.Region.ScriptEngine.Shared.Tests 40namespace OpenSim.Region.ScriptEngine.Shared.Tests
40{ 41{
@@ -52,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
52 public void SetUp() 53 public void SetUp()
53 { 54 {
54 55
55 IniConfigSource initConfigSource = new IniConfigSource(); 56 IConfigSource initConfigSource = new IniConfigSource();
56 IConfig config = initConfigSource.AddConfig("XEngine"); 57 IConfig config = initConfigSource.AddConfig("XEngine");
57 config.Set("Enabled", "true"); 58 config.Set("Enabled", "true");
58 59
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 7142c8c..8195f33 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -70,6 +70,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
70 } 70 }
71 } 71 }
72 72
73 /// <summary>
74 /// When an object gets paid by an avatar and generates the paid event,
75 /// this will pipe it to the script engine
76 /// </summary>
77 /// <param name="objectID">Object ID that got paid</param>
78 /// <param name="agentID">Agent Id that did the paying</param>
79 /// <param name="amount">Amount paid</param>
73 private void HandleObjectPaid(UUID objectID, UUID agentID, 80 private void HandleObjectPaid(UUID objectID, UUID agentID,
74 int amount) 81 int amount)
75 { 82 {
@@ -93,6 +100,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
93 } 100 }
94 } 101 }
95 102
103 /// <summary>
104 /// Handles piping the proper stuff to The script engine for touching
105 /// Including DetectedParams
106 /// </summary>
107 /// <param name="localID"></param>
108 /// <param name="originalID"></param>
109 /// <param name="offsetPos"></param>
110 /// <param name="remoteClient"></param>
111 /// <param name="surfaceArgs"></param>
96 public void touch_start(uint localID, uint originalID, Vector3 offsetPos, 112 public void touch_start(uint localID, uint originalID, Vector3 offsetPos,
97 IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) 113 IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs)
98 { 114 {