From 1c7accf9500250abad243eaeb6f6baadf7644e78 Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 24 Aug 2013 05:55:53 -0500
Subject: * Fix a null ref that causes a stack unwind when crossing borders. 
 Less stack unwinding..   the faster it goes. * Tweak XEngine so that it's
 partially functional again.    It's still not great, but basic things work.
 (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)

---
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 2fb073d..275b608 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -231,6 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 ItemID = ScriptTask.ItemID;
                 AssetID = ScriptTask.AssetID;
             }
+            LocalID = part.LocalId;
 
             PrimName = part.ParentGroup.Name;
             StartParam = startParam;
@@ -1240,4 +1241,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             return null;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1