diff options
| author | Melanie | 2010-01-26 14:53:14 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-26 14:53:14 +0000 |
| commit | b80ea002654bd0ab232aee2b0f842be18b8d4edc (patch) | |
| tree | 35971637efd7ec9cbfaee88bc5ea56edffddfc1b /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Replace dome tabs with spaces (diff) | |
| download | opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.zip opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.gz opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.bz2 opensim-SC_OLD-b80ea002654bd0ab232aee2b0f842be18b8d4edc.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index d65107e..73850e1 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -923,9 +923,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 923 | 923 | ||
| 924 | instance = null; | 924 | instance = null; |
| 925 | 925 | ||
| 926 | <<<<<<< HEAD:OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||
| 926 | ObjectRemoved handlerObjectRemoved = OnObjectRemoved; | 927 | ObjectRemoved handlerObjectRemoved = OnObjectRemoved; |
| 927 | if (handlerObjectRemoved != null) | 928 | if (handlerObjectRemoved != null) |
| 928 | handlerObjectRemoved(part.UUID); | 929 | handlerObjectRemoved(part.UUID); |
| 930 | ======= | ||
| 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 | ||
| 929 | 938 | ||
| 930 | CleanAssemblies(); | 939 | CleanAssemblies(); |
| 931 | 940 | ||