diff options
Diffstat (limited to '')
5 files changed, 26 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index bd11d97..9fb1041 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | |||
@@ -34,6 +34,7 @@ using OpenMetaverse; | |||
34 | using OpenMetaverse.Packets; | 34 | using OpenMetaverse.Packets; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Tests.Common; | 36 | using OpenSim.Tests.Common; |
37 | using OpenSim.Tests.Common.Mock; | ||
37 | 38 | ||
38 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests | 39 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests |
39 | { | 40 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 88452d2..8ec14c7 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); | 72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); |
73 | 73 | ||
74 | ISharedRegionModule interregionComms = new RESTInterregionComms(); | 74 | ISharedRegionModule interregionComms = new RESTInterregionComms(); |
75 | interregionComms.Initialise(new IniConfigSource()); | 75 | interregionComms.Initialise( new IniConfigSource()); |
76 | interregionComms.PostInitialise(); | 76 | interregionComms.PostInitialise(); |
77 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); | 77 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); |
78 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); | 78 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); |
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; | |||
35 | using OpenSim.Region.ScriptEngine.Shared.Api; | 35 | using OpenSim.Region.ScriptEngine.Shared.Api; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using System; | 37 | using System; |
38 | using OpenSim.Tests.Common.Mock; | ||
38 | 39 | ||
39 | namespace OpenSim.Region.ScriptEngine.Shared.Tests | 40 | namespace 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 | { |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index b1b32cc..f418252 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -154,7 +154,7 @@ namespace OpenSim.Tests.Common.Setup | |||
154 | TestScene testScene = new TestScene( | 154 | TestScene testScene = new TestScene( |
155 | regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); | 155 | regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); |
156 | 156 | ||
157 | INonSharedRegionModule capsModule = new CapabilitiesModule(); | 157 | INonSharedRegionModule capsModule = new CapabilitiesModule(); |
158 | capsModule.Initialise(new IniConfigSource()); | 158 | capsModule.Initialise(new IniConfigSource()); |
159 | testScene.AddRegionModule(capsModule.Name, capsModule); | 159 | testScene.AddRegionModule(capsModule.Name, capsModule); |
160 | capsModule.AddRegion(testScene); | 160 | capsModule.AddRegion(testScene); |
@@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup | |||
163 | godsModule.Initialise(testScene, new IniConfigSource()); | 163 | godsModule.Initialise(testScene, new IniConfigSource()); |
164 | testScene.AddModule(godsModule.Name, godsModule); | 164 | testScene.AddModule(godsModule.Name, godsModule); |
165 | realServices = realServices.ToLower(); | 165 | realServices = realServices.ToLower(); |
166 | IniConfigSource config = new IniConfigSource(); | 166 | IConfigSource config = new IniConfigSource(); |
167 | 167 | ||
168 | // If we have a brand new scene, need to initialize shared region modules | 168 | // If we have a brand new scene, need to initialize shared region modules |
169 | if ((m_assetService == null && m_inventoryService == null) || newScene) | 169 | if ((m_assetService == null && m_inventoryService == null) || newScene) |
@@ -198,7 +198,7 @@ namespace OpenSim.Tests.Common.Setup | |||
198 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 198 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
199 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | 199 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); |
200 | testScene.PhysicsScene | 200 | testScene.PhysicsScene |
201 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test"); | 201 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); |
202 | 202 | ||
203 | return testScene; | 203 | return testScene; |
204 | } | 204 | } |
@@ -206,7 +206,7 @@ namespace OpenSim.Tests.Common.Setup | |||
206 | private static void StartAssetService(Scene testScene, bool real) | 206 | private static void StartAssetService(Scene testScene, bool real) |
207 | { | 207 | { |
208 | ISharedRegionModule assetService = new LocalAssetServicesConnector(); | 208 | ISharedRegionModule assetService = new LocalAssetServicesConnector(); |
209 | IniConfigSource config = new IniConfigSource(); | 209 | IConfigSource config = new IniConfigSource(); |
210 | config.AddConfig("Modules"); | 210 | config.AddConfig("Modules"); |
211 | config.AddConfig("AssetService"); | 211 | config.AddConfig("AssetService"); |
212 | config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); | 212 | config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); |
@@ -225,7 +225,7 @@ namespace OpenSim.Tests.Common.Setup | |||
225 | private static void StartInventoryService(Scene testScene, bool real) | 225 | private static void StartInventoryService(Scene testScene, bool real) |
226 | { | 226 | { |
227 | ISharedRegionModule inventoryService = new LocalInventoryServicesConnector(); | 227 | ISharedRegionModule inventoryService = new LocalInventoryServicesConnector(); |
228 | IniConfigSource config = new IniConfigSource(); | 228 | IConfigSource config = new IniConfigSource(); |
229 | config.AddConfig("Modules"); | 229 | config.AddConfig("Modules"); |
230 | config.AddConfig("InventoryService"); | 230 | config.AddConfig("InventoryService"); |
231 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); | 231 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); |
@@ -418,4 +418,5 @@ namespace OpenSim.Tests.Common.Setup | |||
418 | sogd.InventoryDeQueueAndDelete(); | 418 | sogd.InventoryDeQueueAndDelete(); |
419 | } | 419 | } |
420 | } | 420 | } |
421 | |||
421 | } | 422 | } |