ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-14 19:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Diva Canto
2009-08-17 05:55:38 -07:00
parent 052c51f90f 644db1e540
commit fa8a94577a
46 changed files with 1738 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
View File

@@ -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");

16
OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
View File

@@ -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)
{