diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 7af0b20..5811ed9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -892,16 +892,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
892 | offsetHeight = 0; | 892 | offsetHeight = 0; |
893 | return false; | 893 | return false; |
894 | } | 894 | } |
895 | <<<<<<< HEAD | ||
896 | |||
897 | Vector3 bbox; | ||
898 | float offsetHeight; | ||
899 | |||
900 | m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight); | ||
901 | ======= | ||
902 | 895 | ||
903 | bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight); | 896 | bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight); |
904 | >>>>>>> avn/ubitvar | ||
905 | 897 | ||
906 | for (int i = 0; i < objlist.Count; i++) | 898 | for (int i = 0; i < objlist.Count; i++) |
907 | { | 899 | { |
@@ -1068,12 +1060,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1068 | m_items.LockItemsForRead(false); | 1060 | m_items.LockItemsForRead(false); |
1069 | if (type == 10) // Script | 1061 | if (type == 10) // Script |
1070 | { | 1062 | { |
1071 | <<<<<<< HEAD | ||
1072 | // route it through here, to handle script cleanup tasks | ||
1073 | RemoveScriptInstance(itemID, false); | ||
1074 | ======= | ||
1075 | m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); | 1063 | m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); |
1076 | >>>>>>> avn/ubitvar | ||
1077 | } | 1064 | } |
1078 | m_items.LockItemsForWrite(true); | 1065 | m_items.LockItemsForWrite(true); |
1079 | m_items.Remove(itemID); | 1066 | m_items.Remove(itemID); |