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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
This commit is contained in:
Melanie
2012-03-26 14:22:49 +01:00
parent 5f1f956d17 3810e98474
commit da9743d1d7
5 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
View File

@@ -122,6 +122,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// <param name="fname">The name of the function to invoke</param>
/// <param name="parms">List of parameters</param>
/// <returns>string result of the invocation</returns>
public void modInvokeN(string fname, params object[] parms)
{
Type returntype = m_comms.LookupReturnType(fname);
if (returntype != typeof(string))
MODError(String.Format("return type mismatch for {0}",fname));
modInvoke(fname,parms);
}
public LSL_String modInvokeS(string fname, params object[] parms)
{
Type returntype = m_comms.LookupReturnType(fname);
@@ -243,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// non-null but don't trust it completely
try
{
object result = m_comms.InvokeOperation(m_itemID,fname,convertedParms);
object result = m_comms.InvokeOperation(m_host.UUID, m_itemID, fname, convertedParms);
if (result != null)
return result;