aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2010-01-26 15:12:41 +0000
committerMelanie2010-01-26 15:12:41 +0000
commite9c9a74e0ade505ee8d8d8e7790141f758a65f61 (patch)
tree8aec3c51c714b0f2ec713880759cfd8f6a7cbcd3 /OpenSim/Region/ScriptEngine
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.zip
opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.gz
opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.bz2
opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.xz
Some merge fixups
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs18
1 files changed, 3 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 73850e1..35d57d8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -885,12 +885,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
885 instance.ClearQueue(); 885 instance.ClearQueue();
886 instance.Stop(0); 886 instance.Stop(0);
887 887
888 SceneObjectPart part =
889 m_Scene.GetSceneObjectPart(localID);
890
891 if (part != null)
892 part.RemoveScriptEvents(itemID);
893
894// bool objectRemoved = false; 888// bool objectRemoved = false;
895 889
896 lock (m_PrimObjects) 890 lock (m_PrimObjects)
@@ -923,18 +917,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
923 917
924 instance = null; 918 instance = null;
925 919
926<<<<<<< HEAD:OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
927 ObjectRemoved handlerObjectRemoved = OnObjectRemoved; 920 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
928 if (handlerObjectRemoved != null) 921 if (handlerObjectRemoved != null)
922 {
923 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
929 handlerObjectRemoved(part.UUID); 924 handlerObjectRemoved(part.UUID);
930======= 925 }
931 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
932 if (handlerObjectRemoved != null)
933 {
934 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
935 handlerObjectRemoved(part.UUID);
936 }
937>>>>>>> master:OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
938 926
939 CleanAssemblies(); 927 CleanAssemblies();
940 928