diff options
| author | Melanie | 2010-02-22 03:00:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-22 03:00:59 +0000 |
| commit | 1f45e6c6497e05638f014e92098165befbbea100 (patch) | |
| tree | 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | One more test running. (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC-1f45e6c6497e05638f014e92098165befbbea100.tar.xz | |
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index c552b92..98e77c0 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -841,7 +841,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 841 | ObjectRemoved handlerObjectRemoved = OnObjectRemoved; | 841 | ObjectRemoved handlerObjectRemoved = OnObjectRemoved; |
| 842 | if (handlerObjectRemoved != null) | 842 | if (handlerObjectRemoved != null) |
| 843 | { | 843 | { |
| 844 | SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); | 844 | SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); |
| 845 | handlerObjectRemoved(part.UUID); | 845 | handlerObjectRemoved(part.UUID); |
| 846 | } | 846 | } |
| 847 | 847 | ||