Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
e5b94346b6
|
@ -34,6 +34,7 @@ using OpenMetaverse;
|
|||
using OpenMetaverse.Packets;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Tests.Common;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.LindenUDP.Tests
|
||||
{
|
||||
|
|
|
@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
|
|||
scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm);
|
||||
|
||||
ISharedRegionModule interregionComms = new RESTInterregionComms();
|
||||
interregionComms.Initialise(new IniConfigSource());
|
||||
interregionComms.Initialise( new IniConfigSource());
|
||||
interregionComms.PostInitialise();
|
||||
SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
|
||||
SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
|
||||
|
|
|
@ -35,6 +35,7 @@ using Nini.Config;
|
|||
using OpenSim.Region.ScriptEngine.Shared.Api;
|
||||
using OpenMetaverse;
|
||||
using System;
|
||||
using OpenSim.Tests.Common.Mock;
|
||||
|
||||
namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
||||
{
|
||||
|
@ -52,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
|||
public void SetUp()
|
||||
{
|
||||
|
||||
IniConfigSource initConfigSource = new IniConfigSource();
|
||||
IConfigSource initConfigSource = new IniConfigSource();
|
||||
IConfig config = initConfigSource.AddConfig("XEngine");
|
||||
config.Set("Enabled", "true");
|
||||
|
||||
|
|
|
@ -70,6 +70,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// When an object gets paid by an avatar and generates the paid event,
|
||||
/// this will pipe it to the script engine
|
||||
/// </summary>
|
||||
/// <param name="objectID">Object ID that got paid</param>
|
||||
/// <param name="agentID">Agent Id that did the paying</param>
|
||||
/// <param name="amount">Amount paid</param>
|
||||
private void HandleObjectPaid(UUID objectID, UUID agentID,
|
||||
int amount)
|
||||
{
|
||||
|
@ -93,6 +100,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handles piping the proper stuff to The script engine for touching
|
||||
/// Including DetectedParams
|
||||
/// </summary>
|
||||
/// <param name="localID"></param>
|
||||
/// <param name="originalID"></param>
|
||||
/// <param name="offsetPos"></param>
|
||||
/// <param name="remoteClient"></param>
|
||||
/// <param name="surfaceArgs"></param>
|
||||
public void touch_start(uint localID, uint originalID, Vector3 offsetPos,
|
||||
IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs)
|
||||
{
|
||||
|
|
|
@ -154,7 +154,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
TestScene testScene = new TestScene(
|
||||
regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null);
|
||||
|
||||
INonSharedRegionModule capsModule = new CapabilitiesModule();
|
||||
INonSharedRegionModule capsModule = new CapabilitiesModule();
|
||||
capsModule.Initialise(new IniConfigSource());
|
||||
testScene.AddRegionModule(capsModule.Name, capsModule);
|
||||
capsModule.AddRegion(testScene);
|
||||
|
@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
godsModule.Initialise(testScene, new IniConfigSource());
|
||||
testScene.AddModule(godsModule.Name, godsModule);
|
||||
realServices = realServices.ToLower();
|
||||
IniConfigSource config = new IniConfigSource();
|
||||
IConfigSource config = new IniConfigSource();
|
||||
|
||||
// If we have a brand new scene, need to initialize shared region modules
|
||||
if ((m_assetService == null && m_inventoryService == null) || newScene)
|
||||
|
@ -198,7 +198,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
|
||||
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
|
||||
testScene.PhysicsScene
|
||||
= physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test");
|
||||
= physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test");
|
||||
|
||||
return testScene;
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
private static void StartAssetService(Scene testScene, bool real)
|
||||
{
|
||||
ISharedRegionModule assetService = new LocalAssetServicesConnector();
|
||||
IniConfigSource config = new IniConfigSource();
|
||||
IConfigSource config = new IniConfigSource();
|
||||
config.AddConfig("Modules");
|
||||
config.AddConfig("AssetService");
|
||||
config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
|
||||
|
@ -225,7 +225,7 @@ namespace OpenSim.Tests.Common.Setup
|
|||
private static void StartInventoryService(Scene testScene, bool real)
|
||||
{
|
||||
ISharedRegionModule inventoryService = new LocalInventoryServicesConnector();
|
||||
IniConfigSource config = new IniConfigSource();
|
||||
IConfigSource config = new IniConfigSource();
|
||||
config.AddConfig("Modules");
|
||||
config.AddConfig("InventoryService");
|
||||
config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
|
||||
|
@ -418,4 +418,5 @@ namespace OpenSim.Tests.Common.Setup
|
|||
sogd.InventoryDeQueueAndDelete();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue