ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2010-01-26 14:53:14 +00:00
parent d2e17f4ffb 72dd680dd3
commit b80ea00265
90 changed files with 2140 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -923,9 +923,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instance = null;
<<<<<<< HEAD:OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
if (handlerObjectRemoved != null)
handlerObjectRemoved(part.UUID);
=======
ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
if (handlerObjectRemoved != null)
{
SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
handlerObjectRemoved(part.UUID);
}
>>>>>>> master:OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
CleanAssemblies();