diff options
author | UbitUmarov | 2015-09-08 12:43:54 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-08 12:43:54 +0100 |
commit | c4c6fcf7ad0fa7f87d19035a40a995c708f44abd (patch) | |
tree | 3333734f7904f65935caf038c005bf766486b466 | |
parent | improve old ODE prim region borders (diff) | |
download | opensim-SC_OLD-c4c6fcf7ad0fa7f87d19035a40a995c708f44abd.zip opensim-SC_OLD-c4c6fcf7ad0fa7f87d19035a40a995c708f44abd.tar.gz opensim-SC_OLD-c4c6fcf7ad0fa7f87d19035a40a995c708f44abd.tar.bz2 opensim-SC_OLD-c4c6fcf7ad0fa7f87d19035a40a995c708f44abd.tar.xz |
fix missing proprieties get, etc
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 2633f30..1d15d61 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -30,7 +30,6 @@ using System.Collections; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Globalization; | 31 | using System.Globalization; |
32 | using System.IO; | 32 | using System.IO; |
33 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
34 | using System.Reflection; | 33 | using System.Reflection; |
35 | using System.Runtime.Remoting; | 34 | using System.Runtime.Remoting; |
36 | using System.Runtime.Remoting.Lifetime; | 35 | using System.Runtime.Remoting.Lifetime; |
@@ -52,7 +51,8 @@ using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; | |||
52 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 51 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
53 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; | 52 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; |
54 | using OpenSim.Region.ScriptEngine.Interfaces; | 53 | using OpenSim.Region.ScriptEngine.Interfaces; |
55 | using System.Diagnostics; | 54 | |
55 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
56 | 56 | ||
57 | namespace OpenSim.Region.ScriptEngine.Shared.Instance | 57 | namespace OpenSim.Region.ScriptEngine.Shared.Instance |
58 | { | 58 | { |
@@ -187,13 +187,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
187 | 187 | ||
188 | public UUID ItemID { get; private set; } | 188 | public UUID ItemID { get; private set; } |
189 | 189 | ||
190 | public UUID ObjectID { get; private set; } | 190 | public UUID ObjectID { get { return Part.UUID; } } |
191 | 191 | ||
192 | public uint LocalID { get; private set; } | 192 | public uint LocalID { get { return Part.LocalId; } } |
193 | 193 | ||
194 | public UUID RootObjectID { get; private set; } | 194 | public UUID RootObjectID { get { return Part.ParentGroup.UUID; } } |
195 | 195 | ||
196 | public uint RootLocalID { get; private set; } | 196 | public uint RootLocalID { get { return Part.ParentGroup.LocalId; } } |
197 | 197 | ||
198 | public UUID AssetID { get; private set; } | 198 | public UUID AssetID { get; private set; } |
199 | 199 | ||
@@ -252,7 +252,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
252 | ItemID = ScriptTask.ItemID; | 252 | ItemID = ScriptTask.ItemID; |
253 | AssetID = ScriptTask.AssetID; | 253 | AssetID = ScriptTask.AssetID; |
254 | } | 254 | } |
255 | LocalID = part.LocalId; | ||
256 | 255 | ||
257 | PrimName = part.ParentGroup.Name; | 256 | PrimName = part.ParentGroup.Name; |
258 | StartParam = startParam; | 257 | StartParam = startParam; |
@@ -1070,7 +1069,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
1070 | 1069 | ||
1071 | public Dictionary<string, object> GetVars() | 1070 | public Dictionary<string, object> GetVars() |
1072 | { | 1071 | { |
1073 | return m_Script.GetVars(); | 1072 | if (m_Script != null) |
1073 | return m_Script.GetVars(); | ||
1074 | else | ||
1075 | return new Dictionary<string, object>(); | ||
1074 | } | 1076 | } |
1075 | 1077 | ||
1076 | public void SetVars(Dictionary<string, object> vars) | 1078 | public void SetVars(Dictionary<string, object> vars) |