OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

formatting

integration
SignpostMarv 2012-08-31 13:51:00 +01:00 committed by Melanie
parent 794c5f5a6d
commit 054db94d5d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
View File

@ -172,12 +172,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
if (mi.ReturnType == typeof(void)) if (mi.ReturnType == typeof(void))
{ {
delegateType = Expression.GetActionType(typeArgs.ToArray()); delegateType = Expression.GetActionType(typeArgs.ToArray());
} }
else else
{ {
typeArgs.Add(mi.ReturnType); typeArgs.Add(mi.ReturnType);
delegateType = Expression.GetFuncType(typeArgs.ToArray()); delegateType = Expression.GetFuncType(typeArgs.ToArray());
} }
Delegate fcall; Delegate fcall;
@ -188,13 +188,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
lock (m_scriptInvocation) lock (m_scriptInvocation)
{ {
ParameterInfo[] parameters = fcall.Method.GetParameters (); ParameterInfo[] parameters = fcall.Method.GetParameters();
if (parameters.Length < 2) // Must have two UUID params if (parameters.Length < 2) // Must have two UUID params
return; return;
// Hide the first two parameters // Hide the first two parameters
Type[] parmTypes = new Type[parameters.Length - 2]; Type[] parmTypes = new Type[parameters.Length - 2];
for (int i = 2 ; i < parameters.Length ; i++) for (int i = 2; i < parameters.Length; i++)
parmTypes[i - 2] = parameters[i].ParameterType; parmTypes[i - 2] = parameters[i].ParameterType;
m_scriptInvocation[fcall.Method.Name] = new ScriptInvocationData(fcall.Method.Name, fcall, parmTypes, fcall.Method.ReturnType); m_scriptInvocation[fcall.Method.Name] = new ScriptInvocationData(fcall.Method.Name, fcall, parmTypes, fcall.Method.ReturnType);
} }