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

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@@ -892,16 +892,8 @@ namespace OpenSim.Region.Framework.Scenes
offsetHeight = 0;
return false;
}
<<<<<<< HEAD
Vector3 bbox;
float offsetHeight;
m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
=======
bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
>>>>>>> avn/ubitvar
for (int i = 0; i < objlist.Count; i++)
{
@@ -1068,12 +1060,7 @@ namespace OpenSim.Region.Framework.Scenes
m_items.LockItemsForRead(false);
if (type == 10) // Script
{
<<<<<<< HEAD
// route it through here, to handle script cleanup tasks
RemoveScriptInstance(itemID, false);
=======
m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
>>>>>>> avn/ubitvar
}
m_items.LockItemsForWrite(true);
m_items.Remove(itemID);