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

fix missing proprieties get, etc

avinationmerge
UbitUmarov 2015-09-08 12:43:54 +01:00
parent 2a84ef861a
commit c4c6fcf7ad
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -30,7 +30,6 @@ using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Diagnostics; //for [DebuggerNonUserCode]
using System.Reflection;
using System.Runtime.Remoting;
using System.Runtime.Remoting.Lifetime;
@ -52,7 +51,8 @@ using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
using OpenSim.Region.ScriptEngine.Shared.CodeTools;
using OpenSim.Region.ScriptEngine.Interfaces;
using System.Diagnostics;
using System.Diagnostics; //for [DebuggerNonUserCode]
namespace OpenSim.Region.ScriptEngine.Shared.Instance
{
@ -187,13 +187,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public UUID ItemID { get; private set; }
public UUID ObjectID { get; private set; }
public UUID ObjectID { get { return Part.UUID; } }
public uint LocalID { get; private set; }
public uint LocalID { get { return Part.LocalId; } }
public UUID RootObjectID { get; private set; }
public UUID RootObjectID { get { return Part.ParentGroup.UUID; } }
public uint RootLocalID { get; private set; }
public uint RootLocalID { get { return Part.ParentGroup.LocalId; } }
public UUID AssetID { get; private set; }
@ -252,7 +252,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
ItemID = ScriptTask.ItemID;
AssetID = ScriptTask.AssetID;
}
LocalID = part.LocalId;
PrimName = part.ParentGroup.Name;
StartParam = startParam;
@ -1070,7 +1069,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public Dictionary<string, object> GetVars()
{
return m_Script.GetVars();
if (m_Script != null)
return m_Script.GetVars();
else
return new Dictionary<string, object>();
}
public void SetVars(Dictionary<string, object> vars)