aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs24
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs323
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs492
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs37
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs225
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs17
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs569
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs199
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs806
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs182
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs28
-rw-r--r--OpenSim/Region/Framework/Scenes/UndoState.cs87
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs4
17 files changed, 2277 insertions, 727 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index fd35c62..74d9e60 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -55,8 +55,12 @@ namespace OpenSim.Region.Framework.Scenes
55 55
56 public delegate void OnTerrainTickDelegate(); 56 public delegate void OnTerrainTickDelegate();
57 57
58 public delegate void OnTerrainUpdateDelegate();
59
58 public event OnTerrainTickDelegate OnTerrainTick; 60 public event OnTerrainTickDelegate OnTerrainTick;
59 61
62 public event OnTerrainUpdateDelegate OnTerrainUpdate;
63
60 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup); 64 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup);
61 65
62 public event OnBackupDelegate OnBackup; 66 public event OnBackupDelegate OnBackup;
@@ -791,6 +795,26 @@ namespace OpenSim.Region.Framework.Scenes
791 } 795 }
792 } 796 }
793 } 797 }
798 public void TriggerTerrainUpdate()
799 {
800 OnTerrainUpdateDelegate handlerTerrainUpdate = OnTerrainUpdate;
801 if (handlerTerrainUpdate != null)
802 {
803 foreach (OnTerrainUpdateDelegate d in handlerTerrainUpdate.GetInvocationList())
804 {
805 try
806 {
807 d();
808 }
809 catch (Exception e)
810 {
811 m_log.ErrorFormat(
812 "[EVENT MANAGER]: Delegate for TriggerTerrainUpdate failed - continuing. {0} {1}",
813 e.Message, e.StackTrace);
814 }
815 }
816 }
817 }
794 818
795 public void TriggerTerrainTick() 819 public void TriggerTerrainTick()
796 { 820 {
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 1b10e3c..0a34a4c 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Framework.Scenes
157 157
158 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity) 158 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
159 { 159 {
160 uint pqueue = ComputeDistancePriority(client,entity,true); 160 uint pqueue = ComputeDistancePriority(client,entity,false);
161 161
162 ScenePresence presence = m_scene.GetScenePresence(client.AgentId); 162 ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
163 if (presence != null) 163 if (presence != null)
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Framework.Scenes
226 226
227 for (int i = 0; i < queues - 1; i++) 227 for (int i = 0; i < queues - 1; i++)
228 { 228 {
229 if (distance < 10 * Math.Pow(2.0,i)) 229 if (distance < 30 * Math.Pow(2.0,i))
230 break; 230 break;
231 pqueue++; 231 pqueue++;
232 } 232 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f344dcc..764bd2f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -117,34 +117,22 @@ namespace OpenSim.Region.Framework.Scenes
117 /// <param name="item"></param> 117 /// <param name="item"></param>
118 public bool AddInventoryItem(InventoryItemBase item) 118 public bool AddInventoryItem(InventoryItemBase item)
119 { 119 {
120 if (UUID.Zero == item.Folder) 120 InventoryFolderBase folder;
121
122 if (item.Folder == UUID.Zero)
121 { 123 {
122 InventoryFolderBase f = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType); 124 folder = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
123 if (f != null) 125 if (folder == null)
124 { 126 {
125// m_log.DebugFormat( 127 folder = InventoryService.GetRootFolder(item.Owner);
126// "[LOCAL INVENTORY SERVICES CONNECTOR]: Found folder {0} type {1} for item {2}", 128
127// f.Name, (AssetType)f.Type, item.Name); 129 if (folder == null)
128
129 item.Folder = f.ID;
130 }
131 else
132 {
133 f = InventoryService.GetRootFolder(item.Owner);
134 if (f != null)
135 {
136 item.Folder = f.ID;
137 }
138 else
139 {
140 m_log.WarnFormat(
141 "[AGENT INVENTORY]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
142 item.Owner, item.Name);
143 return false; 130 return false;
144 }
145 } 131 }
132
133 item.Folder = folder.ID;
146 } 134 }
147 135
148 if (InventoryService.AddItem(item)) 136 if (InventoryService.AddItem(item))
149 { 137 {
150 int userlevel = 0; 138 int userlevel = 0;
@@ -264,8 +252,7 @@ namespace OpenSim.Region.Framework.Scenes
264 252
265 // Update item with new asset 253 // Update item with new asset
266 item.AssetID = asset.FullID; 254 item.AssetID = asset.FullID;
267 if (group.UpdateInventoryItem(item)) 255 group.UpdateInventoryItem(item);
268 remoteClient.SendAgentAlertMessage("Script saved", false);
269 256
270 part.SendPropertiesToClient(remoteClient); 257 part.SendPropertiesToClient(remoteClient);
271 258
@@ -276,12 +263,7 @@ namespace OpenSim.Region.Framework.Scenes
276 { 263 {
277 // Needs to determine which engine was running it and use that 264 // Needs to determine which engine was running it and use that
278 // 265 //
279 part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); 266 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0);
280 errors = part.Inventory.GetScriptErrors(item.ItemID);
281 }
282 else
283 {
284 remoteClient.SendAgentAlertMessage("Script saved", false);
285 } 267 }
286 part.ParentGroup.ResumeScripts(); 268 part.ParentGroup.ResumeScripts();
287 return errors; 269 return errors;
@@ -345,6 +327,7 @@ namespace OpenSim.Region.Framework.Scenes
345 327
346 if (UUID.Zero == transactionID) 328 if (UUID.Zero == transactionID)
347 { 329 {
330 item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
348 item.Name = itemUpd.Name; 331 item.Name = itemUpd.Name;
349 item.Description = itemUpd.Description; 332 item.Description = itemUpd.Description;
350 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) 333 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions))
@@ -723,6 +706,8 @@ namespace OpenSim.Region.Framework.Scenes
723 return; 706 return;
724 } 707 }
725 708
709 if (newName == null) newName = item.Name;
710
726 AssetBase asset = AssetService.Get(item.AssetID.ToString()); 711 AssetBase asset = AssetService.Get(item.AssetID.ToString());
727 712
728 if (asset != null) 713 if (asset != null)
@@ -779,6 +764,24 @@ namespace OpenSim.Region.Framework.Scenes
779 } 764 }
780 765
781 /// <summary> 766 /// <summary>
767 /// Move an item within the agent's inventory, and leave a copy (used in making a new outfit)
768 /// </summary>
769 public void MoveInventoryItemsLeaveCopy(IClientAPI remoteClient, List<InventoryItemBase> items, UUID destfolder)
770 {
771 List<InventoryItemBase> moveitems = new List<InventoryItemBase>();
772 foreach (InventoryItemBase b in items)
773 {
774 CopyInventoryItem(remoteClient, 0, remoteClient.AgentId, b.ID, b.Folder, null);
775 InventoryItemBase n = InventoryService.GetItem(b);
776 n.Folder = destfolder;
777 moveitems.Add(n);
778 remoteClient.SendInventoryItemCreateUpdate(n, 0);
779 }
780
781 MoveInventoryItem(remoteClient, moveitems);
782 }
783
784 /// <summary>
782 /// Move an item within the agent's inventory. 785 /// Move an item within the agent's inventory.
783 /// </summary> 786 /// </summary>
784 /// <param name="remoteClient"></param> 787 /// <param name="remoteClient"></param>
@@ -1121,6 +1124,10 @@ namespace OpenSim.Region.Framework.Scenes
1121 { 1124 {
1122 SceneObjectPart part = GetSceneObjectPart(primLocalId); 1125 SceneObjectPart part = GetSceneObjectPart(primLocalId);
1123 1126
1127 // Can't move a null item
1128 if (itemId == UUID.Zero)
1129 return;
1130
1124 if (null == part) 1131 if (null == part)
1125 { 1132 {
1126 m_log.WarnFormat( 1133 m_log.WarnFormat(
@@ -1231,6 +1238,10 @@ namespace OpenSim.Region.Framework.Scenes
1231 if ((part.OwnerID != destPart.OwnerID) && ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)) 1238 if ((part.OwnerID != destPart.OwnerID) && ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0))
1232 return; 1239 return;
1233 1240
1241 bool overrideNoMod = false;
1242 if ((part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
1243 overrideNoMod = true;
1244
1234 if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0) 1245 if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
1235 { 1246 {
1236 // object cannot copy items to an object owned by a different owner 1247 // object cannot copy items to an object owned by a different owner
@@ -1240,7 +1251,7 @@ namespace OpenSim.Region.Framework.Scenes
1240 } 1251 }
1241 1252
1242 // must have both move and modify permission to put an item in an object 1253 // must have both move and modify permission to put an item in an object
1243 if ((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0) 1254 if (((part.OwnerMask & (uint)PermissionMask.Modify) == 0) && (!overrideNoMod))
1244 { 1255 {
1245 return; 1256 return;
1246 } 1257 }
@@ -1299,6 +1310,14 @@ namespace OpenSim.Region.Framework.Scenes
1299 1310
1300 public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items) 1311 public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items)
1301 { 1312 {
1313 SceneObjectPart destPart = GetSceneObjectPart(destID);
1314 if (destPart != null) // Move into a prim
1315 {
1316 foreach(UUID itemID in items)
1317 MoveTaskInventoryItem(destID, host, itemID);
1318 return destID; // Prim folder ID == prim ID
1319 }
1320
1302 InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID); 1321 InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID);
1303 1322
1304 UUID newFolderID = UUID.Random(); 1323 UUID newFolderID = UUID.Random();
@@ -1478,13 +1497,6 @@ namespace OpenSim.Region.Framework.Scenes
1478 { 1497 {
1479 agentTransactions.HandleTaskItemUpdateFromTransaction( 1498 agentTransactions.HandleTaskItemUpdateFromTransaction(
1480 remoteClient, part, transactionID, currentItem); 1499 remoteClient, part, transactionID, currentItem);
1481
1482 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1483 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1484 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1485 remoteClient.SendAgentAlertMessage("Script saved", false);
1486 else
1487 remoteClient.SendAgentAlertMessage("Item saved", false);
1488 } 1500 }
1489 1501
1490 // Base ALWAYS has move 1502 // Base ALWAYS has move
@@ -1663,7 +1675,7 @@ namespace OpenSim.Region.Framework.Scenes
1663 } 1675 }
1664 1676
1665 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, 1677 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
1666 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), 1678 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"),
1667 agentID); 1679 agentID);
1668 AssetService.Store(asset); 1680 AssetService.Store(asset);
1669 1681
@@ -1815,23 +1827,32 @@ namespace OpenSim.Region.Framework.Scenes
1815 // build a list of eligible objects 1827 // build a list of eligible objects
1816 List<uint> deleteIDs = new List<uint>(); 1828 List<uint> deleteIDs = new List<uint>();
1817 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); 1829 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
1818 1830 List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
1819 // Start with true for both, then remove the flags if objects
1820 // that we can't derez are part of the selection
1821 bool permissionToTake = true;
1822 bool permissionToTakeCopy = true;
1823 bool permissionToDelete = true;
1824 1831
1825 foreach (uint localID in localIDs) 1832 foreach (uint localID in localIDs)
1826 { 1833 {
1834 // Start with true for both, then remove the flags if objects
1835 // that we can't derez are part of the selection
1836 bool permissionToTake = true;
1837 bool permissionToTakeCopy = true;
1838 bool permissionToDelete = true;
1839
1827 // Invalid id 1840 // Invalid id
1828 SceneObjectPart part = GetSceneObjectPart(localID); 1841 SceneObjectPart part = GetSceneObjectPart(localID);
1829 if (part == null) 1842 if (part == null)
1843 {
1844 //Client still thinks the object exists, kill it
1845 deleteIDs.Add(localID);
1830 continue; 1846 continue;
1847 }
1831 1848
1832 // Already deleted by someone else 1849 // Already deleted by someone else
1833 if (part.ParentGroup.IsDeleted) 1850 if (part.ParentGroup.IsDeleted)
1851 {
1852 //Client still thinks the object exists, kill it
1853 deleteIDs.Add(localID);
1834 continue; 1854 continue;
1855 }
1835 1856
1836 // Can't delete child prims 1857 // Can't delete child prims
1837 if (part != part.ParentGroup.RootPart) 1858 if (part != part.ParentGroup.RootPart)
@@ -1839,9 +1860,6 @@ namespace OpenSim.Region.Framework.Scenes
1839 1860
1840 SceneObjectGroup grp = part.ParentGroup; 1861 SceneObjectGroup grp = part.ParentGroup;
1841 1862
1842 deleteIDs.Add(localID);
1843 deleteGroups.Add(grp);
1844
1845 if (remoteClient == null) 1863 if (remoteClient == null)
1846 { 1864 {
1847 // Autoreturn has a null client. Nothing else does. So 1865 // Autoreturn has a null client. Nothing else does. So
@@ -1858,83 +1876,195 @@ namespace OpenSim.Region.Framework.Scenes
1858 } 1876 }
1859 else 1877 else
1860 { 1878 {
1861 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId)) 1879 if (action == DeRezAction.TakeCopy)
1880 {
1881 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
1882 permissionToTakeCopy = false;
1883 }
1884 else
1885 {
1862 permissionToTakeCopy = false; 1886 permissionToTakeCopy = false;
1863 1887 }
1864 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId)) 1888 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
1865 permissionToTake = false; 1889 permissionToTake = false;
1866 1890
1867 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId)) 1891 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
1868 permissionToDelete = false; 1892 permissionToDelete = false;
1869 } 1893 }
1870 }
1871 1894
1872 // Handle god perms 1895 // Handle god perms
1873 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId)) 1896 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
1874 { 1897 {
1875 permissionToTake = true; 1898 permissionToTake = true;
1876 permissionToTakeCopy = true; 1899 permissionToTakeCopy = true;
1877 permissionToDelete = true; 1900 permissionToDelete = true;
1878 } 1901 }
1879 1902
1880 // If we're re-saving, we don't even want to delete 1903 // If we're re-saving, we don't even want to delete
1881 if (action == DeRezAction.SaveToExistingUserInventoryItem) 1904 if (action == DeRezAction.SaveToExistingUserInventoryItem)
1882 permissionToDelete = false; 1905 permissionToDelete = false;
1883 1906
1884 // if we want to take a copy, we also don't want to delete 1907 // if we want to take a copy, we also don't want to delete
1885 // Note: after this point, the permissionToTakeCopy flag 1908 // Note: after this point, the permissionToTakeCopy flag
1886 // becomes irrelevant. It already includes the permissionToTake 1909 // becomes irrelevant. It already includes the permissionToTake
1887 // permission and after excluding no copy items here, we can 1910 // permission and after excluding no copy items here, we can
1888 // just use that. 1911 // just use that.
1889 if (action == DeRezAction.TakeCopy) 1912 if (action == DeRezAction.TakeCopy)
1890 { 1913 {
1891 // If we don't have permission, stop right here 1914 // If we don't have permission, stop right here
1892 if (!permissionToTakeCopy) 1915 if (!permissionToTakeCopy)
1893 return; 1916 return;
1894 1917
1895 permissionToTake = true; 1918 permissionToTake = true;
1896 // Don't delete 1919 // Don't delete
1897 permissionToDelete = false; 1920 permissionToDelete = false;
1898 } 1921 }
1899 1922
1900 if (action == DeRezAction.Return) 1923 if (action == DeRezAction.Return)
1901 {
1902 if (remoteClient != null)
1903 { 1924 {
1904 if (Permissions.CanReturnObjects( 1925 if (remoteClient != null)
1905 null,
1906 remoteClient.AgentId,
1907 deleteGroups))
1908 { 1926 {
1909 permissionToTake = true; 1927 if (Permissions.CanReturnObjects(
1910 permissionToDelete = true; 1928 null,
1911 1929 remoteClient.AgentId,
1912 foreach (SceneObjectGroup g in deleteGroups) 1930 deleteGroups))
1913 { 1931 {
1914 AddReturn(g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); 1932 permissionToTake = true;
1933 permissionToDelete = true;
1934
1935 AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
1915 } 1936 }
1916 } 1937 }
1938 else // Auto return passes through here with null agent
1939 {
1940 permissionToTake = true;
1941 permissionToDelete = true;
1942 }
1917 } 1943 }
1918 else // Auto return passes through here with null agent 1944
1945 if (permissionToTake && (!permissionToDelete))
1946 takeGroups.Add(grp);
1947
1948 if (permissionToDelete)
1919 { 1949 {
1920 permissionToTake = true; 1950 if (permissionToTake)
1921 permissionToDelete = true; 1951 deleteGroups.Add(grp);
1952 deleteIDs.Add(grp.LocalId);
1922 } 1953 }
1923 } 1954 }
1924 1955
1925 if (permissionToTake) 1956 SendKillObject(deleteIDs);
1957
1958 if (deleteGroups.Count > 0)
1926 { 1959 {
1960 foreach (SceneObjectGroup g in deleteGroups)
1961 deleteIDs.Remove(g.LocalId);
1962
1927 m_asyncSceneObjectDeleter.DeleteToInventory( 1963 m_asyncSceneObjectDeleter.DeleteToInventory(
1928 action, destinationID, deleteGroups, remoteClient, 1964 action, destinationID, deleteGroups, remoteClient,
1929 permissionToDelete); 1965 true);
1966 }
1967 if (takeGroups.Count > 0)
1968 {
1969 m_asyncSceneObjectDeleter.DeleteToInventory(
1970 action, destinationID, takeGroups, remoteClient,
1971 false);
1930 } 1972 }
1931 else if (permissionToDelete) 1973 if (deleteIDs.Count > 0)
1932 { 1974 {
1933 foreach (SceneObjectGroup g in deleteGroups) 1975 foreach (SceneObjectGroup g in deleteGroups)
1934 DeleteSceneObject(g, false); 1976 DeleteSceneObject(g, true);
1935 } 1977 }
1936 } 1978 }
1937 1979
1980 public UUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, UUID AgentId, out UUID itemID)
1981 {
1982 itemID = UUID.Zero;
1983 if (grp != null)
1984 {
1985 Vector3 inventoryStoredPosition = new Vector3
1986 (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
1987 ? 250
1988 : grp.AbsolutePosition.X)
1989 ,
1990 (grp.AbsolutePosition.X > (int)Constants.RegionSize)
1991 ? 250
1992 : grp.AbsolutePosition.X,
1993 grp.AbsolutePosition.Z);
1994
1995 Vector3 originalPosition = grp.AbsolutePosition;
1996
1997 grp.AbsolutePosition = inventoryStoredPosition;
1998
1999 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
2000
2001 grp.AbsolutePosition = originalPosition;
2002
2003 AssetBase asset = CreateAsset(
2004 grp.GetPartName(grp.LocalId),
2005 grp.GetPartDescription(grp.LocalId),
2006 (sbyte)AssetType.Object,
2007 Utils.StringToBytes(sceneObjectXml),
2008 remoteClient.AgentId);
2009 AssetService.Store(asset);
2010
2011 InventoryItemBase item = new InventoryItemBase();
2012 item.CreatorId = grp.RootPart.CreatorID.ToString();
2013 item.CreatorData = grp.RootPart.CreatorData;
2014 item.Owner = remoteClient.AgentId;
2015 item.ID = UUID.Random();
2016 item.AssetID = asset.FullID;
2017 item.Description = asset.Description;
2018 item.Name = asset.Name;
2019 item.AssetType = asset.Type;
2020 item.InvType = (int)InventoryType.Object;
2021
2022 InventoryFolderBase folder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object);
2023 if (folder != null)
2024 item.Folder = folder.ID;
2025 else // oopsies
2026 item.Folder = UUID.Zero;
2027
2028 // Set up base perms properly
2029 uint permsBase = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify);
2030 permsBase &= grp.RootPart.BaseMask;
2031 permsBase |= (uint)PermissionMask.Move;
2032
2033 // Make sure we don't lock it
2034 grp.RootPart.NextOwnerMask |= (uint)PermissionMask.Move;
2035
2036 if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions())
2037 {
2038 item.BasePermissions = permsBase & grp.RootPart.NextOwnerMask;
2039 item.CurrentPermissions = permsBase & grp.RootPart.NextOwnerMask;
2040 item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
2041 item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask;
2042 item.GroupPermissions = permsBase & grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask;
2043 }
2044 else
2045 {
2046 item.BasePermissions = permsBase;
2047 item.CurrentPermissions = permsBase & grp.RootPart.OwnerMask;
2048 item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
2049 item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask;
2050 item.GroupPermissions = permsBase & grp.RootPart.GroupMask;
2051 }
2052 item.CreationDate = Util.UnixTimeSinceEpoch();
2053
2054 // sets itemID so client can show item as 'attached' in inventory
2055 grp.SetFromItemID(item.ID);
2056
2057 if (AddInventoryItem(item))
2058 remoteClient.SendInventoryItemCreateUpdate(item, 0);
2059 else
2060 m_dialogModule.SendAlertToUser(remoteClient, "Operation failed");
2061
2062 itemID = item.ID;
2063 return item.AssetID;
2064 }
2065 return UUID.Zero;
2066 }
2067
1938 /// <summary> 2068 /// <summary>
1939 /// Event Handler Rez an object into a scene 2069 /// Event Handler Rez an object into a scene
1940 /// Calls the non-void event handler 2070 /// Calls the non-void event handler
@@ -2061,6 +2191,9 @@ namespace OpenSim.Region.Framework.Scenes
2061 2191
2062 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running) 2192 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
2063 { 2193 {
2194 if (!Permissions.CanEditScript(itemID, objectID, controllingClient.AgentId))
2195 return;
2196
2064 SceneObjectPart part = GetSceneObjectPart(objectID); 2197 SceneObjectPart part = GetSceneObjectPart(objectID);
2065 if (part == null) 2198 if (part == null)
2066 return; 2199 return;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 3355ebe..bf2e775 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -346,7 +346,10 @@ namespace OpenSim.Region.Framework.Scenes
346 List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query); 346 List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query);
347 347
348 if (accounts == null) 348 if (accounts == null)
349 {
350 m_log.DebugFormat("[LLCIENT]: ProcessAvatarPickerRequest: returned null result");
349 return; 351 return;
352 }
350 353
351 AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); 354 AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
352 // TODO: don't create new blocks if recycling an old packet 355 // TODO: don't create new blocks if recycling an old packet
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f03c345..0ebdbb7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -104,6 +104,7 @@ namespace OpenSim.Region.Framework.Scenes
104 // TODO: need to figure out how allow client agents but deny 104 // TODO: need to figure out how allow client agents but deny
105 // root agents when ACL denies access to root agent 105 // root agents when ACL denies access to root agent
106 public bool m_strictAccessControl = true; 106 public bool m_strictAccessControl = true;
107 public bool m_seeIntoBannedRegion = false;
107 public int MaxUndoCount = 5; 108 public int MaxUndoCount = 5;
108 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; 109 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
109 public bool LoginLock = false; 110 public bool LoginLock = false;
@@ -119,12 +120,14 @@ namespace OpenSim.Region.Framework.Scenes
119 120
120 protected int m_splitRegionID; 121 protected int m_splitRegionID;
121 protected Timer m_restartWaitTimer = new Timer(); 122 protected Timer m_restartWaitTimer = new Timer();
123 protected Timer m_timerWatchdog = new Timer();
122 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>(); 124 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>();
123 protected List<RegionInfo> m_neighbours = new List<RegionInfo>(); 125 protected List<RegionInfo> m_neighbours = new List<RegionInfo>();
124 protected string m_simulatorVersion = "OpenSimulator Server"; 126 protected string m_simulatorVersion = "OpenSimulator Server";
125 protected ModuleLoader m_moduleLoader; 127 protected ModuleLoader m_moduleLoader;
126 protected AgentCircuitManager m_authenticateHandler; 128 protected AgentCircuitManager m_authenticateHandler;
127 protected SceneCommunicationService m_sceneGridService; 129 protected SceneCommunicationService m_sceneGridService;
130 protected ISnmpModule m_snmpService = null;
128 131
129 protected ISimulationDataService m_SimulationDataService; 132 protected ISimulationDataService m_SimulationDataService;
130 protected IEstateDataService m_EstateDataService; 133 protected IEstateDataService m_EstateDataService;
@@ -177,7 +180,7 @@ namespace OpenSim.Region.Framework.Scenes
177 private int m_update_events = 1; 180 private int m_update_events = 1;
178 private int m_update_backup = 200; 181 private int m_update_backup = 200;
179 private int m_update_terrain = 50; 182 private int m_update_terrain = 50;
180// private int m_update_land = 1; 183 private int m_update_land = 10;
181 private int m_update_coarse_locations = 50; 184 private int m_update_coarse_locations = 50;
182 185
183 private int agentMS; 186 private int agentMS;
@@ -192,6 +195,7 @@ namespace OpenSim.Region.Framework.Scenes
192 private int landMS; 195 private int landMS;
193 private int lastCompletedFrame; 196 private int lastCompletedFrame;
194 197
198 public bool CombineRegions = false;
195 /// <summary> 199 /// <summary>
196 /// Signals whether temporary objects are currently being cleaned up. Needed because this is launched 200 /// Signals whether temporary objects are currently being cleaned up. Needed because this is launched
197 /// asynchronously from the update loop. 201 /// asynchronously from the update loop.
@@ -214,11 +218,14 @@ namespace OpenSim.Region.Framework.Scenes
214 private bool m_scripts_enabled = true; 218 private bool m_scripts_enabled = true;
215 private string m_defaultScriptEngine; 219 private string m_defaultScriptEngine;
216 private int m_LastLogin; 220 private int m_LastLogin;
217 private Thread HeartbeatThread; 221 private Thread HeartbeatThread = null;
218 private volatile bool shuttingdown; 222 private volatile bool shuttingdown;
219 223
220 private int m_lastUpdate; 224 private int m_lastUpdate;
225 private int m_lastIncoming;
226 private int m_lastOutgoing;
221 private bool m_firstHeartbeat = true; 227 private bool m_firstHeartbeat = true;
228 private int m_hbRestarts = 0;
222 229
223 private object m_deleting_scene_object = new object(); 230 private object m_deleting_scene_object = new object();
224 231
@@ -265,6 +272,19 @@ namespace OpenSim.Region.Framework.Scenes
265 get { return m_sceneGridService; } 272 get { return m_sceneGridService; }
266 } 273 }
267 274
275 public ISnmpModule SnmpService
276 {
277 get
278 {
279 if (m_snmpService == null)
280 {
281 m_snmpService = RequestModuleInterface<ISnmpModule>();
282 }
283
284 return m_snmpService;
285 }
286 }
287
268 public ISimulationDataService SimulationDataService 288 public ISimulationDataService SimulationDataService
269 { 289 {
270 get 290 get
@@ -546,6 +566,9 @@ namespace OpenSim.Region.Framework.Scenes
546 m_EstateDataService = estateDataService; 566 m_EstateDataService = estateDataService;
547 m_regionHandle = m_regInfo.RegionHandle; 567 m_regionHandle = m_regInfo.RegionHandle;
548 m_regionName = m_regInfo.RegionName; 568 m_regionName = m_regInfo.RegionName;
569 m_lastUpdate = Util.EnvironmentTickCount();
570 m_lastIncoming = 0;
571 m_lastOutgoing = 0;
549 572
550 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); 573 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
551 m_asyncSceneObjectDeleter.Enabled = true; 574 m_asyncSceneObjectDeleter.Enabled = true;
@@ -663,6 +686,7 @@ namespace OpenSim.Region.Framework.Scenes
663 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); 686 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
664 687
665 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 688 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
689
666 if (RegionInfo.NonphysPrimMax > 0) 690 if (RegionInfo.NonphysPrimMax > 0)
667 { 691 {
668 m_maxNonphys = RegionInfo.NonphysPrimMax; 692 m_maxNonphys = RegionInfo.NonphysPrimMax;
@@ -694,6 +718,7 @@ namespace OpenSim.Region.Framework.Scenes
694 m_persistAfter *= 10000000; 718 m_persistAfter *= 10000000;
695 719
696 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); 720 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
721 m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
697 722
698 IConfig packetConfig = m_config.Configs["PacketPool"]; 723 IConfig packetConfig = m_config.Configs["PacketPool"];
699 if (packetConfig != null) 724 if (packetConfig != null)
@@ -703,6 +728,8 @@ namespace OpenSim.Region.Framework.Scenes
703 } 728 }
704 729
705 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); 730 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
731 m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
732 CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
706 733
707 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true); 734 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
708 if (m_generateMaptiles) 735 if (m_generateMaptiles)
@@ -738,9 +765,9 @@ namespace OpenSim.Region.Framework.Scenes
738 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); 765 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain);
739 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); 766 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning);
740 } 767 }
741 catch 768 catch (Exception e)
742 { 769 {
743 m_log.Warn("[SCENE]: Failed to load StartupConfig"); 770 m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString());
744 } 771 }
745 772
746 #endregion Region Config 773 #endregion Region Config
@@ -1151,7 +1178,22 @@ namespace OpenSim.Region.Framework.Scenes
1151 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 1178 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
1152 if (HeartbeatThread != null) 1179 if (HeartbeatThread != null)
1153 { 1180 {
1181 m_hbRestarts++;
1182 if(m_hbRestarts > 10)
1183 Environment.Exit(1);
1184 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
1185
1186//int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
1187//System.Diagnostics.Process proc = new System.Diagnostics.Process();
1188//proc.EnableRaisingEvents=false;
1189//proc.StartInfo.FileName = "/bin/kill";
1190//proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
1191//proc.Start();
1192//proc.WaitForExit();
1193//Thread.Sleep(1000);
1194//Environment.Exit(1);
1154 HeartbeatThread.Abort(); 1195 HeartbeatThread.Abort();
1196 Watchdog.AbortThread(HeartbeatThread.ManagedThreadId);
1155 HeartbeatThread = null; 1197 HeartbeatThread = null;
1156 } 1198 }
1157 m_lastUpdate = Util.EnvironmentTickCount(); 1199 m_lastUpdate = Util.EnvironmentTickCount();
@@ -1198,9 +1240,6 @@ namespace OpenSim.Region.Framework.Scenes
1198 m_eventManager.TriggerOnRegionStarted(this); 1240 m_eventManager.TriggerOnRegionStarted(this);
1199 while (!shuttingdown) 1241 while (!shuttingdown)
1200 Update(); 1242 Update();
1201
1202 m_lastUpdate = Util.EnvironmentTickCount();
1203 m_firstHeartbeat = false;
1204 } 1243 }
1205 catch (ThreadAbortException) 1244 catch (ThreadAbortException)
1206 { 1245 {
@@ -1298,6 +1337,13 @@ namespace OpenSim.Region.Framework.Scenes
1298 eventMS = Util.EnvironmentTickCountSubtract(evMS); ; 1337 eventMS = Util.EnvironmentTickCountSubtract(evMS); ;
1299 } 1338 }
1300 1339
1340 // if (Frame % m_update_land == 0)
1341 // {
1342 // int ldMS = Util.EnvironmentTickCount();
1343 // UpdateLand();
1344 // landMS = Util.EnvironmentTickCountSubtract(ldMS);
1345 // }
1346
1301 if (Frame % m_update_backup == 0) 1347 if (Frame % m_update_backup == 0)
1302 { 1348 {
1303 int backMS = Util.EnvironmentTickCount(); 1349 int backMS = Util.EnvironmentTickCount();
@@ -1405,12 +1451,16 @@ namespace OpenSim.Region.Framework.Scenes
1405 maintc = Util.EnvironmentTickCountSubtract(maintc); 1451 maintc = Util.EnvironmentTickCountSubtract(maintc);
1406 maintc = (int)(MinFrameTime * 1000) - maintc; 1452 maintc = (int)(MinFrameTime * 1000) - maintc;
1407 1453
1454
1455 m_lastUpdate = Util.EnvironmentTickCount();
1456 m_firstHeartbeat = false;
1457
1408 if (maintc > 0) 1458 if (maintc > 0)
1409 Thread.Sleep(maintc); 1459 Thread.Sleep(maintc);
1410 1460
1411 // Tell the watchdog that this thread is still alive 1461 // Tell the watchdog that this thread is still alive
1412 Watchdog.UpdateThread(); 1462 Watchdog.UpdateThread();
1413 } 1463 }
1414 1464
1415 public void AddGroupTarget(SceneObjectGroup grp) 1465 public void AddGroupTarget(SceneObjectGroup grp)
1416 { 1466 {
@@ -1426,9 +1476,9 @@ namespace OpenSim.Region.Framework.Scenes
1426 1476
1427 private void CheckAtTargets() 1477 private void CheckAtTargets()
1428 { 1478 {
1429 Dictionary<UUID, SceneObjectGroup>.ValueCollection objs; 1479 List<SceneObjectGroup> objs = new List<SceneObjectGroup>();
1430 lock (m_groupsWithTargets) 1480 lock (m_groupsWithTargets)
1431 objs = m_groupsWithTargets.Values; 1481 objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
1432 1482
1433 foreach (SceneObjectGroup entry in objs) 1483 foreach (SceneObjectGroup entry in objs)
1434 entry.checkAtTargets(); 1484 entry.checkAtTargets();
@@ -1510,7 +1560,7 @@ namespace OpenSim.Region.Framework.Scenes
1510 msg.fromAgentName = "Server"; 1560 msg.fromAgentName = "Server";
1511 msg.dialog = (byte)19; // Object msg 1561 msg.dialog = (byte)19; // Object msg
1512 msg.fromGroup = false; 1562 msg.fromGroup = false;
1513 msg.offline = (byte)0; 1563 msg.offline = (byte)1;
1514 msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID; 1564 msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID;
1515 msg.Position = Vector3.Zero; 1565 msg.Position = Vector3.Zero;
1516 msg.RegionID = RegionInfo.RegionID.Guid; 1566 msg.RegionID = RegionInfo.RegionID.Guid;
@@ -1741,14 +1791,24 @@ namespace OpenSim.Region.Framework.Scenes
1741 /// <returns></returns> 1791 /// <returns></returns>
1742 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter) 1792 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter)
1743 { 1793 {
1794
1795 float wheight = (float)RegionInfo.RegionSettings.WaterHeight;
1796 Vector3 wpos = Vector3.Zero;
1797 // Check for water surface intersection from above
1798 if ( (RayStart.Z > wheight) && (RayEnd.Z < wheight) )
1799 {
1800 float ratio = (RayStart.Z - wheight) / (RayStart.Z - RayEnd.Z);
1801 wpos.X = RayStart.X - (ratio * (RayStart.X - RayEnd.X));
1802 wpos.Y = RayStart.Y - (ratio * (RayStart.Y - RayEnd.Y));
1803 wpos.Z = wheight;
1804 }
1805
1744 Vector3 pos = Vector3.Zero; 1806 Vector3 pos = Vector3.Zero;
1745 if (RayEndIsIntersection == (byte)1) 1807 if (RayEndIsIntersection == (byte)1)
1746 { 1808 {
1747 pos = RayEnd; 1809 pos = RayEnd;
1748 return pos;
1749 } 1810 }
1750 1811 else if (RayTargetID != UUID.Zero)
1751 if (RayTargetID != UUID.Zero)
1752 { 1812 {
1753 SceneObjectPart target = GetSceneObjectPart(RayTargetID); 1813 SceneObjectPart target = GetSceneObjectPart(RayTargetID);
1754 1814
@@ -1770,7 +1830,7 @@ namespace OpenSim.Region.Framework.Scenes
1770 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter); 1830 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter);
1771 1831
1772 // Un-comment out the following line to Get Raytrace results printed to the console. 1832 // Un-comment out the following line to Get Raytrace results printed to the console.
1773 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); 1833 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
1774 float ScaleOffset = 0.5f; 1834 float ScaleOffset = 0.5f;
1775 1835
1776 // If we hit something 1836 // If we hit something
@@ -1793,13 +1853,10 @@ namespace OpenSim.Region.Framework.Scenes
1793 //pos.Z -= 0.25F; 1853 //pos.Z -= 0.25F;
1794 1854
1795 } 1855 }
1796
1797 return pos;
1798 } 1856 }
1799 else 1857 else
1800 { 1858 {
1801 // We don't have a target here, so we're going to raytrace all the objects in the scene. 1859 // We don't have a target here, so we're going to raytrace all the objects in the scene.
1802
1803 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false); 1860 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false);
1804 1861
1805 // Un-comment the following line to print the raytrace results to the console. 1862 // Un-comment the following line to print the raytrace results to the console.
@@ -1808,13 +1865,12 @@ namespace OpenSim.Region.Framework.Scenes
1808 if (ei.HitTF) 1865 if (ei.HitTF)
1809 { 1866 {
1810 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); 1867 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
1811 } else 1868 }
1869 else
1812 { 1870 {
1813 // fall back to our stupid functionality 1871 // fall back to our stupid functionality
1814 pos = RayEnd; 1872 pos = RayEnd;
1815 } 1873 }
1816
1817 return pos;
1818 } 1874 }
1819 } 1875 }
1820 else 1876 else
@@ -1825,8 +1881,12 @@ namespace OpenSim.Region.Framework.Scenes
1825 //increase height so its above the ground. 1881 //increase height so its above the ground.
1826 //should be getting the normal of the ground at the rez point and using that? 1882 //should be getting the normal of the ground at the rez point and using that?
1827 pos.Z += scale.Z / 2f; 1883 pos.Z += scale.Z / 2f;
1828 return pos; 1884// return pos;
1829 } 1885 }
1886
1887 // check against posible water intercept
1888 if (wpos.Z > pos.Z) pos = wpos;
1889 return pos;
1830 } 1890 }
1831 1891
1832 1892
@@ -1910,7 +1970,10 @@ namespace OpenSim.Region.Framework.Scenes
1910 public bool AddRestoredSceneObject( 1970 public bool AddRestoredSceneObject(
1911 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 1971 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
1912 { 1972 {
1913 return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); 1973 bool result = m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
1974 if (result)
1975 sceneObject.IsDeleted = false;
1976 return result;
1914 } 1977 }
1915 1978
1916 /// <summary> 1979 /// <summary>
@@ -2000,6 +2063,15 @@ namespace OpenSim.Region.Framework.Scenes
2000 /// </summary> 2063 /// </summary>
2001 public void DeleteAllSceneObjects() 2064 public void DeleteAllSceneObjects()
2002 { 2065 {
2066 DeleteAllSceneObjects(false);
2067 }
2068
2069 /// <summary>
2070 /// Delete every object from the scene. This does not include attachments worn by avatars.
2071 /// </summary>
2072 public void DeleteAllSceneObjects(bool exceptNoCopy)
2073 {
2074 List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>();
2003 lock (Entities) 2075 lock (Entities)
2004 { 2076 {
2005 EntityBase[] entities = Entities.GetEntities(); 2077 EntityBase[] entities = Entities.GetEntities();
@@ -2008,11 +2080,24 @@ namespace OpenSim.Region.Framework.Scenes
2008 if (e is SceneObjectGroup) 2080 if (e is SceneObjectGroup)
2009 { 2081 {
2010 SceneObjectGroup sog = (SceneObjectGroup)e; 2082 SceneObjectGroup sog = (SceneObjectGroup)e;
2011 if (!sog.IsAttachment) 2083 if (sog != null && !sog.IsAttachment)
2012 DeleteSceneObject((SceneObjectGroup)e, false); 2084 {
2085 if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
2086 {
2087 DeleteSceneObject((SceneObjectGroup)e, false);
2088 }
2089 else
2090 {
2091 toReturn.Add((SceneObjectGroup)e);
2092 }
2093 }
2013 } 2094 }
2014 } 2095 }
2015 } 2096 }
2097 if (toReturn.Count > 0)
2098 {
2099 returnObjects(toReturn.ToArray(), UUID.Zero);
2100 }
2016 } 2101 }
2017 2102
2018 /// <summary> 2103 /// <summary>
@@ -2060,6 +2145,8 @@ namespace OpenSim.Region.Framework.Scenes
2060 } 2145 }
2061 2146
2062 group.DeleteGroupFromScene(silent); 2147 group.DeleteGroupFromScene(silent);
2148 if (!silent)
2149 SendKillObject(new List<uint>() { group.LocalId });
2063 2150
2064// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); 2151// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
2065 } 2152 }
@@ -2414,10 +2501,17 @@ namespace OpenSim.Region.Framework.Scenes
2414 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> 2501 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
2415 public bool AddSceneObject(SceneObjectGroup sceneObject) 2502 public bool AddSceneObject(SceneObjectGroup sceneObject)
2416 { 2503 {
2504 if (sceneObject.OwnerID == UUID.Zero)
2505 {
2506 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero", sceneObject.UUID);
2507 return false;
2508 }
2509
2417 // If the user is banned, we won't let any of their objects 2510 // If the user is banned, we won't let any of their objects
2418 // enter. Period. 2511 // enter. Period.
2419 // 2512 //
2420 if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID)) 2513 int flags = GetUserFlags(sceneObject.OwnerID);
2514 if (m_regInfo.EstateSettings.IsBanned(sceneObject.OwnerID, flags))
2421 { 2515 {
2422 m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", sceneObject.OwnerID); 2516 m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", sceneObject.OwnerID);
2423 2517
@@ -2463,12 +2557,23 @@ namespace OpenSim.Region.Framework.Scenes
2463 } 2557 }
2464 else 2558 else
2465 { 2559 {
2560 m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was not found, setting to temp", sceneObject.UUID);
2466 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2561 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2467 RootPrim.AddFlag(PrimFlags.TemporaryOnRez); 2562 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2468 } 2563 }
2564 if (sceneObject.OwnerID == UUID.Zero)
2565 {
2566 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero after attachment processing. BUG!", sceneObject.UUID);
2567 return false;
2568 }
2469 } 2569 }
2470 else 2570 else
2471 { 2571 {
2572 if (sceneObject.OwnerID == UUID.Zero)
2573 {
2574 m_log.ErrorFormat("[SCENE]: Owner ID for non-attachment {0} was zero", sceneObject.UUID);
2575 return false;
2576 }
2472 AddRestoredSceneObject(sceneObject, true, false); 2577 AddRestoredSceneObject(sceneObject, true, false);
2473 2578
2474 if (!Permissions.CanObjectEntry(sceneObject.UUID, 2579 if (!Permissions.CanObjectEntry(sceneObject.UUID,
@@ -2497,6 +2602,24 @@ namespace OpenSim.Region.Framework.Scenes
2497 return 2; // StateSource.PrimCrossing 2602 return 2; // StateSource.PrimCrossing
2498 } 2603 }
2499 2604
2605 public int GetUserFlags(UUID user)
2606 {
2607 //Unfortunately the SP approach means that the value is cached until region is restarted
2608 /*
2609 ScenePresence sp;
2610 if (TryGetScenePresence(user, out sp))
2611 {
2612 return sp.UserFlags;
2613 }
2614 else
2615 {
2616 */
2617 UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user);
2618 if (uac == null)
2619 return 0;
2620 return uac.UserFlags;
2621 //}
2622 }
2500 #endregion 2623 #endregion
2501 2624
2502 #region Add/Remove Avatar Methods 2625 #region Add/Remove Avatar Methods
@@ -2511,6 +2634,7 @@ namespace OpenSim.Region.Framework.Scenes
2511 || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; 2634 || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
2512 2635
2513 CheckHeartbeat(); 2636 CheckHeartbeat();
2637 ScenePresence presence;
2514 2638
2515 ScenePresence sp = GetScenePresence(client.AgentId); 2639 ScenePresence sp = GetScenePresence(client.AgentId);
2516 2640
@@ -2559,7 +2683,13 @@ namespace OpenSim.Region.Framework.Scenes
2559 2683
2560 EventManager.TriggerOnNewClient(client); 2684 EventManager.TriggerOnNewClient(client);
2561 if (vialogin) 2685 if (vialogin)
2686 {
2562 EventManager.TriggerOnClientLogin(client); 2687 EventManager.TriggerOnClientLogin(client);
2688 // Send initial parcel data
2689 Vector3 pos = sp.AbsolutePosition;
2690 ILandObject land = LandChannel.GetLandObject(pos.X, pos.Y);
2691 land.SendLandUpdateToClient(client);
2692 }
2563 2693
2564 return sp; 2694 return sp;
2565 } 2695 }
@@ -2649,19 +2779,12 @@ namespace OpenSim.Region.Framework.Scenes
2649 // and the scene presence and the client, if they exist 2779 // and the scene presence and the client, if they exist
2650 try 2780 try
2651 { 2781 {
2652 // We need to wait for the client to make UDP contact first. 2782 ScenePresence sp = GetScenePresence(agentID);
2653 // It's the UDP contact that creates the scene presence 2783 PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
2654 ScenePresence sp = WaitGetScenePresence(agentID); 2784
2655 if (sp != null) 2785 if (sp != null)
2656 {
2657 PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
2658
2659 sp.ControllingClient.Close(); 2786 sp.ControllingClient.Close();
2660 } 2787
2661 else
2662 {
2663 m_log.WarnFormat("[SCENE]: Could not find scene presence for {0}", agentID);
2664 }
2665 // BANG! SLASH! 2788 // BANG! SLASH!
2666 m_authenticateHandler.RemoveCircuit(agentID); 2789 m_authenticateHandler.RemoveCircuit(agentID);
2667 2790
@@ -2762,6 +2885,7 @@ namespace OpenSim.Region.Framework.Scenes
2762 client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory; 2885 client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory;
2763 client.OnUpdateInventoryItem += UpdateInventoryItemAsset; 2886 client.OnUpdateInventoryItem += UpdateInventoryItemAsset;
2764 client.OnCopyInventoryItem += CopyInventoryItem; 2887 client.OnCopyInventoryItem += CopyInventoryItem;
2888 client.OnMoveItemsAndLeaveCopy += MoveInventoryItemsLeaveCopy;
2765 client.OnMoveInventoryItem += MoveInventoryItem; 2889 client.OnMoveInventoryItem += MoveInventoryItem;
2766 client.OnRemoveInventoryItem += RemoveInventoryItem; 2890 client.OnRemoveInventoryItem += RemoveInventoryItem;
2767 client.OnRemoveInventoryFolder += RemoveInventoryFolder; 2891 client.OnRemoveInventoryFolder += RemoveInventoryFolder;
@@ -2937,15 +3061,16 @@ namespace OpenSim.Region.Framework.Scenes
2937 /// </summary> 3061 /// </summary>
2938 /// <param name="agentId">The avatar's Unique ID</param> 3062 /// <param name="agentId">The avatar's Unique ID</param>
2939 /// <param name="client">The IClientAPI for the client</param> 3063 /// <param name="client">The IClientAPI for the client</param>
2940 public virtual void TeleportClientHome(UUID agentId, IClientAPI client) 3064 public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
2941 { 3065 {
2942 if (m_teleportModule != null) 3066 if (m_teleportModule != null)
2943 m_teleportModule.TeleportHome(agentId, client); 3067 return m_teleportModule.TeleportHome(agentId, client);
2944 else 3068 else
2945 { 3069 {
2946 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); 3070 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
2947 client.SendTeleportFailed("Unable to perform teleports on this simulator."); 3071 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
2948 } 3072 }
3073 return false;
2949 } 3074 }
2950 3075
2951 /// <summary> 3076 /// <summary>
@@ -3037,6 +3162,16 @@ namespace OpenSim.Region.Framework.Scenes
3037 /// <param name="flags"></param> 3162 /// <param name="flags"></param>
3038 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags) 3163 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
3039 { 3164 {
3165 //Add half the avatar's height so that the user doesn't fall through prims
3166 ScenePresence presence;
3167 if (TryGetScenePresence(remoteClient.AgentId, out presence))
3168 {
3169 if (presence.Appearance != null)
3170 {
3171 position.Z = position.Z + (presence.Appearance.AvatarHeight / 2);
3172 }
3173 }
3174
3040 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt)) 3175 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt))
3041 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot. 3176 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
3042 m_dialogModule.SendAlertToUser(remoteClient, "Home position set."); 3177 m_dialogModule.SendAlertToUser(remoteClient, "Home position set.");
@@ -3105,8 +3240,9 @@ namespace OpenSim.Region.Framework.Scenes
3105 regions.Remove(RegionInfo.RegionHandle); 3240 regions.Remove(RegionInfo.RegionHandle);
3106 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); 3241 m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
3107 } 3242 }
3108 3243 m_log.Debug("[Scene] Beginning ClientClosed");
3109 m_eventManager.TriggerClientClosed(agentID, this); 3244 m_eventManager.TriggerClientClosed(agentID, this);
3245 m_log.Debug("[Scene] Finished ClientClosed");
3110 } 3246 }
3111 catch (NullReferenceException) 3247 catch (NullReferenceException)
3112 { 3248 {
@@ -3158,9 +3294,10 @@ namespace OpenSim.Region.Framework.Scenes
3158 { 3294 {
3159 m_log.ErrorFormat("[SCENE] Scene.cs:RemoveClient exception {0}{1}", e.Message, e.StackTrace); 3295 m_log.ErrorFormat("[SCENE] Scene.cs:RemoveClient exception {0}{1}", e.Message, e.StackTrace);
3160 } 3296 }
3161 3297 m_log.Debug("[Scene] Done. Firing RemoveCircuit");
3162 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); 3298 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
3163// CleanDroppedAttachments(); 3299// CleanDroppedAttachments();
3300 m_log.Debug("[Scene] The avatar has left the building");
3164 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); 3301 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
3165 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); 3302 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
3166 } 3303 }
@@ -3279,13 +3416,16 @@ namespace OpenSim.Region.Framework.Scenes
3279 sp = null; 3416 sp = null;
3280 } 3417 }
3281 3418
3282 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3283 3419
3284 //On login test land permisions 3420 //On login test land permisions
3285 if (vialogin) 3421 if (vialogin)
3286 { 3422 {
3287 if (land != null && !TestLandRestrictions(agent, land, out reason)) 3423 IUserAccountCacheModule cache = RequestModuleInterface<IUserAccountCacheModule>();
3424 if (cache != null)
3425 cache.Remove(agent.firstname + " " + agent.lastname);
3426 if (!TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
3288 { 3427 {
3428 m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
3289 return false; 3429 return false;
3290 } 3430 }
3291 } 3431 }
@@ -3309,8 +3449,13 @@ namespace OpenSim.Region.Framework.Scenes
3309 3449
3310 try 3450 try
3311 { 3451 {
3312 if (!AuthorizeUser(agent, out reason)) 3452 // Always check estate if this is a login. Always
3313 return false; 3453 // check if banned regions are to be blacked out.
3454 if (vialogin || (!m_seeIntoBannedRegion))
3455 {
3456 if (!AuthorizeUser(agent, out reason))
3457 return false;
3458 }
3314 } 3459 }
3315 catch (Exception e) 3460 catch (Exception e)
3316 { 3461 {
@@ -3413,6 +3558,8 @@ namespace OpenSim.Region.Framework.Scenes
3413 } 3558 }
3414 } 3559 }
3415 // Honor parcel landing type and position. 3560 // Honor parcel landing type and position.
3561 /*
3562 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3416 if (land != null) 3563 if (land != null)
3417 { 3564 {
3418 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) 3565 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
@@ -3420,26 +3567,34 @@ namespace OpenSim.Region.Framework.Scenes
3420 agent.startpos = land.LandData.UserLocation; 3567 agent.startpos = land.LandData.UserLocation;
3421 } 3568 }
3422 } 3569 }
3570 */// This is now handled properly in ScenePresence.MakeRootAgent
3423 } 3571 }
3424 3572
3425 return true; 3573 return true;
3426 } 3574 }
3427 3575
3428 private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land, out string reason) 3576 public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
3429 { 3577 {
3430 3578 reason = String.Empty;
3431 bool banned = land.IsBannedFromLand(agent.AgentID); 3579 if (Permissions.IsGod(agentID))
3432 bool restricted = land.IsRestrictedFromLand(agent.AgentID); 3580 return true;
3581
3582 ILandObject land = LandChannel.GetLandObject(posX, posY);
3583 if (land == null)
3584 return false;
3585
3586 bool banned = land.IsBannedFromLand(agentID);
3587 bool restricted = land.IsRestrictedFromLand(agentID);
3433 3588
3434 if (banned || restricted) 3589 if (banned || restricted)
3435 { 3590 {
3436 ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y); 3591 ILandObject nearestParcel = GetNearestAllowedParcel(agentID, posX, posY);
3437 if (nearestParcel != null) 3592 if (nearestParcel != null)
3438 { 3593 {
3439 //Move agent to nearest allowed 3594 //Move agent to nearest allowed
3440 Vector3 newPosition = GetParcelCenterAtGround(nearestParcel); 3595 Vector3 newPosition = GetParcelCenterAtGround(nearestParcel);
3441 agent.startpos.X = newPosition.X; 3596 posX = newPosition.X;
3442 agent.startpos.Y = newPosition.Y; 3597 posY = newPosition.Y;
3443 } 3598 }
3444 else 3599 else
3445 { 3600 {
@@ -3501,7 +3656,7 @@ namespace OpenSim.Region.Framework.Scenes
3501 3656
3502 if (!m_strictAccessControl) return true; 3657 if (!m_strictAccessControl) return true;
3503 if (Permissions.IsGod(agent.AgentID)) return true; 3658 if (Permissions.IsGod(agent.AgentID)) return true;
3504 3659
3505 if (AuthorizationService != null) 3660 if (AuthorizationService != null)
3506 { 3661 {
3507 if (!AuthorizationService.IsAuthorizedForRegion( 3662 if (!AuthorizationService.IsAuthorizedForRegion(
@@ -3509,14 +3664,14 @@ namespace OpenSim.Region.Framework.Scenes
3509 { 3664 {
3510 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", 3665 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
3511 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); 3666 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
3512 3667
3513 return false; 3668 return false;
3514 } 3669 }
3515 } 3670 }
3516 3671
3517 if (m_regInfo.EstateSettings != null) 3672 if (m_regInfo.EstateSettings != null)
3518 { 3673 {
3519 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID)) 3674 if (m_regInfo.EstateSettings.IsBanned(agent.AgentID,0))
3520 { 3675 {
3521 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", 3676 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
3522 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); 3677 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
@@ -3708,6 +3863,13 @@ namespace OpenSim.Region.Framework.Scenes
3708 3863
3709 // We have to wait until the viewer contacts this region after receiving EAC. 3864 // We have to wait until the viewer contacts this region after receiving EAC.
3710 // That calls AddNewClient, which finally creates the ScenePresence 3865 // That calls AddNewClient, which finally creates the ScenePresence
3866 int flags = GetUserFlags(cAgentData.AgentID);
3867 if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags))
3868 {
3869 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID);
3870 return false;
3871 }
3872
3711 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); 3873 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
3712 if (nearestParcel == null) 3874 if (nearestParcel == null)
3713 { 3875 {
@@ -3789,12 +3951,22 @@ namespace OpenSim.Region.Framework.Scenes
3789 return false; 3951 return false;
3790 } 3952 }
3791 3953
3954 public bool IncomingCloseAgent(UUID agentID)
3955 {
3956 return IncomingCloseAgent(agentID, false);
3957 }
3958
3959 public bool IncomingCloseChildAgent(UUID agentID)
3960 {
3961 return IncomingCloseAgent(agentID, true);
3962 }
3963
3792 /// <summary> 3964 /// <summary>
3793 /// Tell a single agent to disconnect from the region. 3965 /// Tell a single agent to disconnect from the region.
3794 /// </summary> 3966 /// </summary>
3795 /// <param name="regionHandle"></param>
3796 /// <param name="agentID"></param> 3967 /// <param name="agentID"></param>
3797 public bool IncomingCloseAgent(UUID agentID) 3968 /// <param name="childOnly"></param>
3969 public bool IncomingCloseAgent(UUID agentID, bool childOnly)
3798 { 3970 {
3799 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID); 3971 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
3800 3972
@@ -3806,7 +3978,7 @@ namespace OpenSim.Region.Framework.Scenes
3806 { 3978 {
3807 m_sceneGraph.removeUserCount(false); 3979 m_sceneGraph.removeUserCount(false);
3808 } 3980 }
3809 else 3981 else if (!childOnly)
3810 { 3982 {
3811 m_sceneGraph.removeUserCount(true); 3983 m_sceneGraph.removeUserCount(true);
3812 } 3984 }
@@ -3822,9 +3994,12 @@ namespace OpenSim.Region.Framework.Scenes
3822 } 3994 }
3823 else 3995 else
3824 presence.ControllingClient.SendShutdownConnectionNotice(); 3996 presence.ControllingClient.SendShutdownConnectionNotice();
3997 presence.ControllingClient.Close(false);
3998 }
3999 else if (!childOnly)
4000 {
4001 presence.ControllingClient.Close(true);
3825 } 4002 }
3826
3827 presence.ControllingClient.Close();
3828 return true; 4003 return true;
3829 } 4004 }
3830 4005
@@ -4407,34 +4582,78 @@ namespace OpenSim.Region.Framework.Scenes
4407 SimulationDataService.RemoveObject(uuid, m_regInfo.RegionID); 4582 SimulationDataService.RemoveObject(uuid, m_regInfo.RegionID);
4408 } 4583 }
4409 4584
4410 public int GetHealth() 4585 public int GetHealth(out int flags, out string message)
4411 { 4586 {
4412 // Returns: 4587 // Returns:
4413 // 1 = sim is up and accepting http requests. The heartbeat has 4588 // 1 = sim is up and accepting http requests. The heartbeat has
4414 // stopped and the sim is probably locked up, but a remote 4589 // stopped and the sim is probably locked up, but a remote
4415 // admin restart may succeed 4590 // admin restart may succeed
4416 // 4591 //
4417 // 2 = Sim is up and the heartbeat is running. The sim is likely 4592 // 2 = Sim is up and the heartbeat is running. The sim is likely
4418 // usable for people within and logins _may_ work 4593 // usable for people within
4594 //
4595 // 3 = Sim is up and one packet thread is running. Sim is
4596 // unstable and will not accept new logins
4597 //
4598 // 4 = Sim is up and both packet threads are running. Sim is
4599 // likely usable
4419 // 4600 //
4420 // 3 = We have seen a new user enter within the past 4 minutes 4601 // 5 = We have seen a new user enter within the past 4 minutes
4421 // which can be seen as positive confirmation of sim health 4602 // which can be seen as positive confirmation of sim health
4422 // 4603 //
4604
4605 flags = 0;
4606 message = String.Empty;
4607
4608 CheckHeartbeat();
4609
4610 if (m_firstHeartbeat || (m_lastIncoming == 0 && m_lastOutgoing == 0))
4611 {
4612 // We're still starting
4613 // 0 means "in startup", it can't happen another way, since
4614 // to get here, we must be able to accept http connections
4615 return 0;
4616 }
4617
4423 int health=1; // Start at 1, means we're up 4618 int health=1; // Start at 1, means we're up
4424 4619
4425 if ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000) 4620 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) < 1000)
4621 {
4622 health+=1;
4623 flags |= 1;
4624 }
4625
4626 if (Util.EnvironmentTickCountSubtract(m_lastIncoming) < 1000)
4627 {
4628 health+=1;
4629 flags |= 2;
4630 }
4631
4632 if (Util.EnvironmentTickCountSubtract(m_lastOutgoing) < 1000)
4633 {
4426 health+=1; 4634 health+=1;
4635 flags |= 4;
4636 }
4427 else 4637 else
4638 {
4639int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
4640System.Diagnostics.Process proc = new System.Diagnostics.Process();
4641proc.EnableRaisingEvents=false;
4642proc.StartInfo.FileName = "/bin/kill";
4643proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
4644proc.Start();
4645proc.WaitForExit();
4646Thread.Sleep(1000);
4647Environment.Exit(1);
4648 }
4649
4650 if (flags != 7)
4428 return health; 4651 return health;
4429 4652
4430 // A login in the last 4 mins? We can't be doing too badly 4653 // A login in the last 4 mins? We can't be doing too badly
4431 // 4654 //
4432 if ((Util.EnvironmentTickCountSubtract(m_LastLogin)) < 240000) 4655 if (Util.EnvironmentTickCountSubtract(m_LastLogin) < 240000)
4433 health++; 4656 health++;
4434 else
4435 return health;
4436
4437 CheckHeartbeat();
4438 4657
4439 return health; 4658 return health;
4440 } 4659 }
@@ -4627,7 +4846,7 @@ namespace OpenSim.Region.Framework.Scenes
4627 if (m_firstHeartbeat) 4846 if (m_firstHeartbeat)
4628 return; 4847 return;
4629 4848
4630 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000) 4849 if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 5000)
4631 StartTimer(); 4850 StartTimer();
4632 } 4851 }
4633 4852
@@ -5037,7 +5256,55 @@ namespace OpenSim.Region.Framework.Scenes
5037 mapModule.GenerateMaptile(); 5256 mapModule.GenerateMaptile();
5038 } 5257 }
5039 5258
5040 private void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e) 5259// public void CleanDroppedAttachments()
5260// {
5261// List<SceneObjectGroup> objectsToDelete =
5262// new List<SceneObjectGroup>();
5263//
5264// lock (m_cleaningAttachments)
5265// {
5266// ForEachSOG(delegate (SceneObjectGroup grp)
5267// {
5268// if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
5269// {
5270// UUID agentID = grp.OwnerID;
5271// if (agentID == UUID.Zero)
5272// {
5273// objectsToDelete.Add(grp);
5274// return;
5275// }
5276//
5277// ScenePresence sp = GetScenePresence(agentID);
5278// if (sp == null)
5279// {
5280// objectsToDelete.Add(grp);
5281// return;
5282// }
5283// }
5284// });
5285// }
5286//
5287// foreach (SceneObjectGroup grp in objectsToDelete)
5288// {
5289// m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
5290// DeleteSceneObject(grp, true);
5291// }
5292// }
5293
5294 public void ThreadAlive(int threadCode)
5295 {
5296 switch(threadCode)
5297 {
5298 case 1: // Incoming
5299 m_lastIncoming = Util.EnvironmentTickCount();
5300 break;
5301 case 2: // Incoming
5302 m_lastOutgoing = Util.EnvironmentTickCount();
5303 break;
5304 }
5305 }
5306
5307 public void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e)
5041 { 5308 {
5042 RegenerateMaptile(); 5309 RegenerateMaptile();
5043 5310
@@ -5056,6 +5323,14 @@ namespace OpenSim.Region.Framework.Scenes
5056 // child agent creation, thereby emulating the SL behavior. 5323 // child agent creation, thereby emulating the SL behavior.
5057 public bool QueryAccess(UUID agentID, Vector3 position, out string reason) 5324 public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
5058 { 5325 {
5326 reason = "You are banned from the region";
5327
5328 if (Permissions.IsGod(agentID))
5329 {
5330 reason = String.Empty;
5331 return true;
5332 }
5333
5059 int num = m_sceneGraph.GetNumberOfScenePresences(); 5334 int num = m_sceneGraph.GetNumberOfScenePresences();
5060 5335
5061 if (num >= RegionInfo.RegionSettings.AgentLimit) 5336 if (num >= RegionInfo.RegionSettings.AgentLimit)
@@ -5067,11 +5342,82 @@ namespace OpenSim.Region.Framework.Scenes
5067 } 5342 }
5068 } 5343 }
5069 5344
5345 ScenePresence presence = GetScenePresence(agentID);
5346 IClientAPI client = null;
5347 AgentCircuitData aCircuit = null;
5348
5349 if (presence != null)
5350 {
5351 client = presence.ControllingClient;
5352 if (client != null)
5353 aCircuit = client.RequestClientInfo();
5354 }
5355
5356 // We may be called before there is a presence or a client.
5357 // Fake AgentCircuitData to keep IAuthorizationModule smiling
5358 if (client == null)
5359 {
5360 aCircuit = new AgentCircuitData();
5361 aCircuit.AgentID = agentID;
5362 aCircuit.firstname = String.Empty;
5363 aCircuit.lastname = String.Empty;
5364 }
5365
5366 try
5367 {
5368 if (!AuthorizeUser(aCircuit, out reason))
5369 {
5370 // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
5371 return false;
5372 }
5373 }
5374 catch (Exception e)
5375 {
5376 m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message);
5377 return false;
5378 }
5379
5380 if (position == Vector3.Zero) // Teleport
5381 {
5382 float posX = 128.0f;
5383 float posY = 128.0f;
5384
5385 if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
5386 {
5387 // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
5388 return false;
5389 }
5390 }
5391 else // Walking
5392 {
5393 ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
5394 if (land == null)
5395 return false;
5396
5397 bool banned = land.IsBannedFromLand(agentID);
5398 bool restricted = land.IsRestrictedFromLand(agentID);
5399
5400 if (banned || restricted)
5401 return false;
5402 }
5403
5070 reason = String.Empty; 5404 reason = String.Empty;
5071 return true; 5405 return true;
5072 } 5406 }
5073 5407
5074 /// <summary> 5408 public void StartTimerWatchdog()
5409 {
5410 m_timerWatchdog.Interval = 1000;
5411 m_timerWatchdog.Elapsed += TimerWatchdog;
5412 m_timerWatchdog.AutoReset = true;
5413 m_timerWatchdog.Start();
5414 }
5415
5416 public void TimerWatchdog(object sender, ElapsedEventArgs e)
5417 {
5418 CheckHeartbeat();
5419 }
5420
5075 /// This method deals with movement when an avatar is automatically moving (but this is distinct from the 5421 /// This method deals with movement when an avatar is automatically moving (but this is distinct from the
5076 /// autopilot that moves an avatar to a sit target!. 5422 /// autopilot that moves an avatar to a sit target!.
5077 /// </summary> 5423 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 712e094..da3b4dd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -136,6 +136,8 @@ namespace OpenSim.Region.Framework.Scenes
136 get { return m_permissions; } 136 get { return m_permissions; }
137 } 137 }
138 138
139 protected string m_datastore;
140
139 /* Used by the loadbalancer plugin on GForge */ 141 /* Used by the loadbalancer plugin on GForge */
140 protected RegionStatus m_regStatus; 142 protected RegionStatus m_regStatus;
141 public RegionStatus RegionStatus 143 public RegionStatus RegionStatus
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 58a7b20..27833e8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes
88 88
89 if (neighbour != null) 89 if (neighbour != null)
90 { 90 {
91 m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); 91 // m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize);
92 m_scene.EventManager.TriggerOnRegionUp(neighbour); 92 m_scene.EventManager.TriggerOnRegionUp(neighbour);
93 } 93 }
94 else 94 else
@@ -102,7 +102,7 @@ namespace OpenSim.Region.Framework.Scenes
102 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); 102 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
103 103
104 List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); 104 List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID);
105 m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count); 105 //m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count);
106 foreach (GridRegion n in neighbours) 106 foreach (GridRegion n in neighbours)
107 { 107 {
108 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; 108 InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
@@ -176,10 +176,13 @@ namespace OpenSim.Region.Framework.Scenes
176 } 176 }
177 } 177 }
178 178
179 public delegate void SendCloseChildAgentDelegate(UUID agentID, ulong regionHandle);
180
179 /// <summary> 181 /// <summary>
180 /// Closes a child agent on a given region 182 /// This Closes child agents on neighboring regions
183 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
181 /// </summary> 184 /// </summary>
182 protected void SendCloseChildAgent(UUID agentID, ulong regionHandle) 185 protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
183 { 186 {
184 // let's do our best, but there's not much we can do if the neighbour doesn't accept. 187 // let's do our best, but there's not much we can do if the neighbour doesn't accept.
185 188
@@ -188,31 +191,29 @@ namespace OpenSim.Region.Framework.Scenes
188 Utils.LongToUInts(regionHandle, out x, out y); 191 Utils.LongToUInts(regionHandle, out x, out y);
189 192
190 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y); 193 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
194 m_scene.SimulationService.CloseChildAgent(destination, agentID);
195 }
191 196
192 m_log.DebugFormat( 197 private void SendCloseChildAgentCompleted(IAsyncResult iar)
193 "[INTERGRID]: Sending close agent {0} to region at {1}-{2}", 198 {
194 agentID, destination.RegionCoordX, destination.RegionCoordY); 199 SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
195 200 icon.EndInvoke(iar);
196 m_scene.SimulationService.CloseAgent(destination, agentID);
197 } 201 }
198 202
199 /// <summary>
200 /// Closes a child agents in a collection of regions. Does so asynchronously
201 /// so that the caller doesn't wait.
202 /// </summary>
203 /// <param name="agentID"></param>
204 /// <param name="regionslst"></param>
205 public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst) 203 public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
206 { 204 {
207 foreach (ulong handle in regionslst) 205 foreach (ulong handle in regionslst)
208 { 206 {
209 SendCloseChildAgent(agentID, handle); 207 SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
208 d.BeginInvoke(agentID, handle,
209 SendCloseChildAgentCompleted,
210 d);
210 } 211 }
211 } 212 }
212 213
213 public List<GridRegion> RequestNamedRegions(string name, int maxNumber) 214 public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
214 { 215 {
215 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); 216 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
216 } 217 }
217 } 218 }
218} \ No newline at end of file 219}
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 7f18140..5e8227d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -41,6 +41,12 @@ namespace OpenSim.Region.Framework.Scenes
41{ 41{
42 public delegate void PhysicsCrash(); 42 public delegate void PhysicsCrash();
43 43
44 public delegate void AttachToBackupDelegate(SceneObjectGroup sog);
45
46 public delegate void DetachFromBackupDelegate(SceneObjectGroup sog);
47
48 public delegate void ChangedBackupDelegate(SceneObjectGroup sog);
49
44 /// <summary> 50 /// <summary>
45 /// This class used to be called InnerScene and may not yet truly be a SceneGraph. The non scene graph components 51 /// This class used to be called InnerScene and may not yet truly be a SceneGraph. The non scene graph components
46 /// should be migrated out over time. 52 /// should be migrated out over time.
@@ -54,11 +60,15 @@ namespace OpenSim.Region.Framework.Scenes
54 protected internal event PhysicsCrash UnRecoverableError; 60 protected internal event PhysicsCrash UnRecoverableError;
55 private PhysicsCrash handlerPhysicsCrash = null; 61 private PhysicsCrash handlerPhysicsCrash = null;
56 62
63 public event AttachToBackupDelegate OnAttachToBackup;
64 public event DetachFromBackupDelegate OnDetachFromBackup;
65 public event ChangedBackupDelegate OnChangeBackup;
66
57 #endregion 67 #endregion
58 68
59 #region Fields 69 #region Fields
60 70
61 protected object m_presenceLock = new object(); 71 protected OpenMetaverse.ReaderWriterLockSlim m_scenePresencesLock = new OpenMetaverse.ReaderWriterLockSlim();
62 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>(); 72 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>();
63 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>(); 73 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
64 74
@@ -120,13 +130,18 @@ namespace OpenSim.Region.Framework.Scenes
120 130
121 protected internal void Close() 131 protected internal void Close()
122 { 132 {
123 lock (m_presenceLock) 133 m_scenePresencesLock.EnterWriteLock();
134 try
124 { 135 {
125 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(); 136 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>();
126 List<ScenePresence> newlist = new List<ScenePresence>(); 137 List<ScenePresence> newlist = new List<ScenePresence>();
127 m_scenePresenceMap = newmap; 138 m_scenePresenceMap = newmap;
128 m_scenePresenceArray = newlist; 139 m_scenePresenceArray = newlist;
129 } 140 }
141 finally
142 {
143 m_scenePresencesLock.ExitWriteLock();
144 }
130 145
131 lock (SceneObjectGroupsByFullID) 146 lock (SceneObjectGroupsByFullID)
132 SceneObjectGroupsByFullID.Clear(); 147 SceneObjectGroupsByFullID.Clear();
@@ -265,6 +280,33 @@ namespace OpenSim.Region.Framework.Scenes
265 protected internal bool AddRestoredSceneObject( 280 protected internal bool AddRestoredSceneObject(
266 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 281 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
267 { 282 {
283 if (!m_parentScene.CombineRegions)
284 {
285 // KF: Check for out-of-region, move inside and make static.
286 Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
287 sceneObject.RootPart.GroupPosition.Y,
288 sceneObject.RootPart.GroupPosition.Z);
289 if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
290 npos.X > Constants.RegionSize ||
291 npos.Y > Constants.RegionSize))
292 {
293 if (npos.X < 0.0) npos.X = 1.0f;
294 if (npos.Y < 0.0) npos.Y = 1.0f;
295 if (npos.Z < 0.0) npos.Z = 0.0f;
296 if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
297 if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
298
299 foreach (SceneObjectPart part in sceneObject.Parts)
300 {
301 part.GroupPosition = npos;
302 }
303 sceneObject.RootPart.Velocity = Vector3.Zero;
304 sceneObject.RootPart.AngularVelocity = Vector3.Zero;
305 sceneObject.RootPart.Acceleration = Vector3.Zero;
306 sceneObject.RootPart.Velocity = Vector3.Zero;
307 }
308 }
309
268 if (attachToBackup && (!alreadyPersisted)) 310 if (attachToBackup && (!alreadyPersisted))
269 { 311 {
270 sceneObject.ForceInventoryPersistence(); 312 sceneObject.ForceInventoryPersistence();
@@ -475,6 +517,30 @@ namespace OpenSim.Region.Framework.Scenes
475 m_updateList[obj.UUID] = obj; 517 m_updateList[obj.UUID] = obj;
476 } 518 }
477 519
520 public void FireAttachToBackup(SceneObjectGroup obj)
521 {
522 if (OnAttachToBackup != null)
523 {
524 OnAttachToBackup(obj);
525 }
526 }
527
528 public void FireDetachFromBackup(SceneObjectGroup obj)
529 {
530 if (OnDetachFromBackup != null)
531 {
532 OnDetachFromBackup(obj);
533 }
534 }
535
536 public void FireChangeBackup(SceneObjectGroup obj)
537 {
538 if (OnChangeBackup != null)
539 {
540 OnChangeBackup(obj);
541 }
542 }
543
478 /// <summary> 544 /// <summary>
479 /// Process all pending updates 545 /// Process all pending updates
480 /// </summary> 546 /// </summary>
@@ -592,7 +658,8 @@ namespace OpenSim.Region.Framework.Scenes
592 658
593 Entities[presence.UUID] = presence; 659 Entities[presence.UUID] = presence;
594 660
595 lock (m_presenceLock) 661 m_scenePresencesLock.EnterWriteLock();
662 try
596 { 663 {
597 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 664 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
598 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 665 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -616,6 +683,10 @@ namespace OpenSim.Region.Framework.Scenes
616 m_scenePresenceMap = newmap; 683 m_scenePresenceMap = newmap;
617 m_scenePresenceArray = newlist; 684 m_scenePresenceArray = newlist;
618 } 685 }
686 finally
687 {
688 m_scenePresencesLock.ExitWriteLock();
689 }
619 } 690 }
620 691
621 /// <summary> 692 /// <summary>
@@ -630,7 +701,8 @@ namespace OpenSim.Region.Framework.Scenes
630 agentID); 701 agentID);
631 } 702 }
632 703
633 lock (m_presenceLock) 704 m_scenePresencesLock.EnterWriteLock();
705 try
634 { 706 {
635 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 707 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
636 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 708 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -652,6 +724,10 @@ namespace OpenSim.Region.Framework.Scenes
652 m_log.WarnFormat("[SCENE GRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); 724 m_log.WarnFormat("[SCENE GRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
653 } 725 }
654 } 726 }
727 finally
728 {
729 m_scenePresencesLock.ExitWriteLock();
730 }
655 } 731 }
656 732
657 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F) 733 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -1365,8 +1441,13 @@ namespace OpenSim.Region.Framework.Scenes
1365 { 1441 {
1366 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) 1442 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
1367 { 1443 {
1368 if (m_parentScene.AttachmentsModule != null) 1444 // Set the new attachment point data in the object
1369 m_parentScene.AttachmentsModule.UpdateAttachmentPosition(group, pos); 1445 byte attachmentPoint = group.GetAttachmentPoint();
1446 group.UpdateGroupPosition(pos);
1447 group.IsAttachment = false;
1448 group.AbsolutePosition = group.RootPart.AttachedPos;
1449 group.AttachmentPoint = attachmentPoint;
1450 group.HasGroupChanged = true;
1370 } 1451 }
1371 else 1452 else
1372 { 1453 {
@@ -1638,8 +1719,11 @@ namespace OpenSim.Region.Framework.Scenes
1638 return; 1719 return;
1639 1720
1640 Monitor.Enter(m_updateLock); 1721 Monitor.Enter(m_updateLock);
1722
1641 try 1723 try
1642 { 1724 {
1725 parentGroup.areUpdatesSuspended = true;
1726
1643 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); 1727 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>();
1644 1728
1645 // We do this in reverse to get the link order of the prims correct 1729 // We do this in reverse to get the link order of the prims correct
@@ -1650,9 +1734,13 @@ namespace OpenSim.Region.Framework.Scenes
1650 // Make sure no child prim is set for sale 1734 // Make sure no child prim is set for sale
1651 // So that, on delink, no prims are unwittingly 1735 // So that, on delink, no prims are unwittingly
1652 // left for sale and sold off 1736 // left for sale and sold off
1653 child.RootPart.ObjectSaleType = 0; 1737
1654 child.RootPart.SalePrice = 10; 1738 if (child != null)
1655 childGroups.Add(child); 1739 {
1740 child.RootPart.ObjectSaleType = 0;
1741 child.RootPart.SalePrice = 10;
1742 childGroups.Add(child);
1743 }
1656 } 1744 }
1657 1745
1658 foreach (SceneObjectGroup child in childGroups) 1746 foreach (SceneObjectGroup child in childGroups)
@@ -1671,12 +1759,19 @@ namespace OpenSim.Region.Framework.Scenes
1671 // occur on link to invoke this elsewhere (such as object selection) 1759 // occur on link to invoke this elsewhere (such as object selection)
1672 parentGroup.RootPart.CreateSelected = true; 1760 parentGroup.RootPart.CreateSelected = true;
1673 parentGroup.TriggerScriptChangedEvent(Changed.LINK); 1761 parentGroup.TriggerScriptChangedEvent(Changed.LINK);
1674 parentGroup.HasGroupChanged = true;
1675 parentGroup.ScheduleGroupForFullUpdate();
1676
1677 } 1762 }
1678 finally 1763 finally
1679 { 1764 {
1765 lock (SceneObjectGroupsByLocalPartID)
1766 {
1767 foreach (SceneObjectPart part in parentGroup.Parts)
1768 SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup;
1769 }
1770
1771 parentGroup.areUpdatesSuspended = false;
1772 parentGroup.HasGroupChanged = true;
1773 parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
1774 parentGroup.ScheduleGroupForFullUpdate();
1680 Monitor.Exit(m_updateLock); 1775 Monitor.Exit(m_updateLock);
1681 } 1776 }
1682 } 1777 }
@@ -1713,21 +1808,24 @@ namespace OpenSim.Region.Framework.Scenes
1713 1808
1714 SceneObjectGroup group = part.ParentGroup; 1809 SceneObjectGroup group = part.ParentGroup;
1715 if (!affectedGroups.Contains(group)) 1810 if (!affectedGroups.Contains(group))
1811 {
1812 group.areUpdatesSuspended = true;
1716 affectedGroups.Add(group); 1813 affectedGroups.Add(group);
1814 }
1717 } 1815 }
1718 } 1816 }
1719 } 1817 }
1720 1818
1721 foreach (SceneObjectPart child in childParts) 1819 if (childParts.Count > 0)
1722 { 1820 {
1723 // Unlink all child parts from their groups 1821 foreach (SceneObjectPart child in childParts)
1724 // 1822 {
1725 child.ParentGroup.DelinkFromGroup(child, true); 1823 // Unlink all child parts from their groups
1726 1824 //
1727 // These are not in affected groups and will not be 1825 child.ParentGroup.DelinkFromGroup(child, true);
1728 // handled further. Do the honors here. 1826 child.ParentGroup.HasGroupChanged = true;
1729 child.ParentGroup.HasGroupChanged = true; 1827 child.ParentGroup.ScheduleGroupForFullUpdate();
1730 child.ParentGroup.ScheduleGroupForFullUpdate(); 1828 }
1731 } 1829 }
1732 1830
1733 foreach (SceneObjectPart root in rootParts) 1831 foreach (SceneObjectPart root in rootParts)
@@ -1737,56 +1835,68 @@ namespace OpenSim.Region.Framework.Scenes
1737 // However, editing linked parts and unlinking may be different 1835 // However, editing linked parts and unlinking may be different
1738 // 1836 //
1739 SceneObjectGroup group = root.ParentGroup; 1837 SceneObjectGroup group = root.ParentGroup;
1838 group.areUpdatesSuspended = true;
1740 1839
1741 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); 1840 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
1742 int numChildren = newSet.Count; 1841 int numChildren = newSet.Count;
1743 1842
1843 if (numChildren == 1)
1844 break;
1845
1744 // If there are prims left in a link set, but the root is 1846 // If there are prims left in a link set, but the root is
1745 // slated for unlink, we need to do this 1847 // slated for unlink, we need to do this
1848 // Unlink the remaining set
1746 // 1849 //
1747 if (numChildren != 1) 1850 bool sendEventsToRemainder = true;
1748 { 1851 if (numChildren > 1)
1749 // Unlink the remaining set 1852 sendEventsToRemainder = false;
1750 //
1751 bool sendEventsToRemainder = true;
1752 if (numChildren > 1)
1753 sendEventsToRemainder = false;
1754 1853
1755 foreach (SceneObjectPart p in newSet) 1854 foreach (SceneObjectPart p in newSet)
1855 {
1856 if (p != group.RootPart)
1756 { 1857 {
1757 if (p != group.RootPart) 1858 group.DelinkFromGroup(p, sendEventsToRemainder);
1758 group.DelinkFromGroup(p, sendEventsToRemainder); 1859 if (numChildren > 2)
1860 {
1861 p.ParentGroup.areUpdatesSuspended = true;
1862 }
1863 else
1864 {
1865 p.ParentGroup.HasGroupChanged = true;
1866 p.ParentGroup.ScheduleGroupForFullUpdate();
1867 }
1759 } 1868 }
1869 }
1870
1871 // If there is more than one prim remaining, we
1872 // need to re-link
1873 //
1874 if (numChildren > 2)
1875 {
1876 // Remove old root
1877 //
1878 if (newSet.Contains(root))
1879 newSet.Remove(root);
1760 1880
1761 // If there is more than one prim remaining, we 1881 // Preserve link ordering
1762 // need to re-link
1763 // 1882 //
1764 if (numChildren > 2) 1883 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1765 { 1884 {
1766 // Remove old root 1885 return a.LinkNum.CompareTo(b.LinkNum);
1767 // 1886 });
1768 if (newSet.Contains(root))
1769 newSet.Remove(root);
1770
1771 // Preserve link ordering
1772 //
1773 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1774 {
1775 return a.LinkNum.CompareTo(b.LinkNum);
1776 });
1777 1887
1778 // Determine new root 1888 // Determine new root
1779 // 1889 //
1780 SceneObjectPart newRoot = newSet[0]; 1890 SceneObjectPart newRoot = newSet[0];
1781 newSet.RemoveAt(0); 1891 newSet.RemoveAt(0);
1782 1892
1783 foreach (SceneObjectPart newChild in newSet) 1893 foreach (SceneObjectPart newChild in newSet)
1784 newChild.ClearUpdateSchedule(); 1894 newChild.ClearUpdateSchedule();
1785 1895
1786 LinkObjects(newRoot, newSet); 1896 newRoot.ParentGroup.areUpdatesSuspended = true;
1787 if (!affectedGroups.Contains(newRoot.ParentGroup)) 1897 LinkObjects(newRoot, newSet);
1788 affectedGroups.Add(newRoot.ParentGroup); 1898 if (!affectedGroups.Contains(newRoot.ParentGroup))
1789 } 1899 affectedGroups.Add(newRoot.ParentGroup);
1790 } 1900 }
1791 } 1901 }
1792 1902
@@ -1794,8 +1904,14 @@ namespace OpenSim.Region.Framework.Scenes
1794 // 1904 //
1795 foreach (SceneObjectGroup g in affectedGroups) 1905 foreach (SceneObjectGroup g in affectedGroups)
1796 { 1906 {
1907 // Child prims that have been unlinked and deleted will
1908 // return unless the root is deleted. This will remove them
1909 // from the database. They will be rewritten immediately,
1910 // minus the rows for the unlinked child prims.
1911 m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
1797 g.TriggerScriptChangedEvent(Changed.LINK); 1912 g.TriggerScriptChangedEvent(Changed.LINK);
1798 g.HasGroupChanged = true; // Persist 1913 g.HasGroupChanged = true; // Persist
1914 g.areUpdatesSuspended = false;
1799 g.ScheduleGroupForFullUpdate(); 1915 g.ScheduleGroupForFullUpdate();
1800 } 1916 }
1801 } 1917 }
@@ -1913,9 +2029,6 @@ namespace OpenSim.Region.Framework.Scenes
1913 child.ApplyNextOwnerPermissions(); 2029 child.ApplyNextOwnerPermissions();
1914 } 2030 }
1915 } 2031 }
1916
1917 copy.RootPart.ObjectSaleType = 0;
1918 copy.RootPart.SalePrice = 10;
1919 } 2032 }
1920 2033
1921 // FIXME: This section needs to be refactored so that it just calls AddSceneObject() 2034 // FIXME: This section needs to be refactored so that it just calls AddSceneObject()
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index d73a959..e4eaf3a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Region.Framework.Scenes
356 356
357 public bool TrySetCurrentScene(UUID regionID) 357 public bool TrySetCurrentScene(UUID regionID)
358 { 358 {
359 m_log.Debug("Searching for Region: '" + regionID + "'"); 359// m_log.Debug("Searching for Region: '" + regionID + "'");
360 360
361 lock (m_localScenes) 361 lock (m_localScenes)
362 { 362 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index f173c95..b56d3fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -69,10 +69,6 @@ namespace OpenSim.Region.Framework.Scenes
69 /// <summary> 69 /// <summary>
70 /// Stop the scripts contained in all the prims in this group 70 /// Stop the scripts contained in all the prims in this group
71 /// </summary> 71 /// </summary>
72 /// <param name="sceneObjectBeingDeleted">
73 /// Should be true if these scripts are being removed because the scene
74 /// object is being deleted. This will prevent spurious updates to the client.
75 /// </param>
76 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 72 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
77 { 73 {
78 SceneObjectPart[] parts = m_parts.GetArray(); 74 SceneObjectPart[] parts = m_parts.GetArray();
@@ -227,6 +223,11 @@ namespace OpenSim.Region.Framework.Scenes
227 223
228 public uint GetEffectivePermissions() 224 public uint GetEffectivePermissions()
229 { 225 {
226 return GetEffectivePermissions(false);
227 }
228
229 public uint GetEffectivePermissions(bool useBase)
230 {
230 uint perms=(uint)(PermissionMask.Modify | 231 uint perms=(uint)(PermissionMask.Modify |
231 PermissionMask.Copy | 232 PermissionMask.Copy |
232 PermissionMask.Move | 233 PermissionMask.Move |
@@ -238,7 +239,10 @@ namespace OpenSim.Region.Framework.Scenes
238 for (int i = 0; i < parts.Length; i++) 239 for (int i = 0; i < parts.Length; i++)
239 { 240 {
240 SceneObjectPart part = parts[i]; 241 SceneObjectPart part = parts[i];
241 ownerMask &= part.OwnerMask; 242 if (useBase)
243 ownerMask &= part.BaseMask;
244 else
245 ownerMask &= part.OwnerMask;
242 perms &= part.Inventory.MaskEffectivePermissions(); 246 perms &= part.Inventory.MaskEffectivePermissions();
243 } 247 }
244 248
@@ -378,6 +382,9 @@ namespace OpenSim.Region.Framework.Scenes
378 382
379 public void ResumeScripts() 383 public void ResumeScripts()
380 { 384 {
385 if (m_scene.RegionInfo.RegionSettings.DisableScripts)
386 return;
387
381 SceneObjectPart[] parts = m_parts.GetArray(); 388 SceneObjectPart[] parts = m_parts.GetArray();
382 for (int i = 0; i < parts.Length; i++) 389 for (int i = 0; i < parts.Length; i++)
383 parts[i].Inventory.ResumeScripts(); 390 parts[i].Inventory.ResumeScripts();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index cad09b8..3b0d1cd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -24,11 +24,12 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Diagnostics;
32using System.Linq; 33using System.Linq;
33using System.Threading; 34using System.Threading;
34using System.Xml; 35using System.Xml;
@@ -105,8 +106,29 @@ namespace OpenSim.Region.Framework.Scenes
105 /// since the group's last persistent backup 106 /// since the group's last persistent backup
106 /// </summary> 107 /// </summary>
107 private bool m_hasGroupChanged = false; 108 private bool m_hasGroupChanged = false;
108 private long timeFirstChanged; 109 private long timeFirstChanged = 0;
109 private long timeLastChanged; 110 private long timeLastChanged = 0;
111 private long m_maxPersistTime = 0;
112 private long m_minPersistTime = 0;
113 private Random m_rand;
114 private bool m_suspendUpdates;
115 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
116
117 public bool areUpdatesSuspended
118 {
119 get
120 {
121 return m_suspendUpdates;
122 }
123 set
124 {
125 m_suspendUpdates = value;
126 if (!value)
127 {
128 QueueForUpdateCheck();
129 }
130 }
131 }
110 132
111 public bool HasGroupChanged 133 public bool HasGroupChanged
112 { 134 {
@@ -114,9 +136,39 @@ namespace OpenSim.Region.Framework.Scenes
114 { 136 {
115 if (value) 137 if (value)
116 { 138 {
139 if (m_isBackedUp)
140 {
141 m_scene.SceneGraph.FireChangeBackup(this);
142 }
117 timeLastChanged = DateTime.Now.Ticks; 143 timeLastChanged = DateTime.Now.Ticks;
118 if (!m_hasGroupChanged) 144 if (!m_hasGroupChanged)
119 timeFirstChanged = DateTime.Now.Ticks; 145 timeFirstChanged = DateTime.Now.Ticks;
146 if (m_rootPart != null && m_rootPart.UUID != null && m_scene != null)
147 {
148 if (m_rand == null)
149 {
150 byte[] val = new byte[16];
151 m_rootPart.UUID.ToBytes(val, 0);
152 m_rand = new Random(BitConverter.ToInt32(val, 0));
153 }
154
155 if (m_scene.GetRootAgentCount() == 0)
156 {
157 //If the region is empty, this change has been made by an automated process
158 //and thus we delay the persist time by a random amount between 1.5 and 2.5.
159
160 float factor = 1.5f + (float)(m_rand.NextDouble());
161 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * factor);
162 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * factor);
163 }
164 else
165 {
166 //If the region is not empty, we want to obey the minimum and maximum persist times
167 //but add a random factor so we stagger the object persistance a little
168 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * (1.0d - (m_rand.NextDouble() / 5.0d))); //Multiply by 1.0-1.5
169 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * (1.0d + (m_rand.NextDouble() / 2.0d))); //Multiply by 0.8-1.0
170 }
171 }
120 } 172 }
121 m_hasGroupChanged = value; 173 m_hasGroupChanged = value;
122 174
@@ -131,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
131 /// Has the group changed due to an unlink operation? We record this in order to optimize deletion, since 183 /// Has the group changed due to an unlink operation? We record this in order to optimize deletion, since
132 /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation. 184 /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation.
133 /// </summary> 185 /// </summary>
134 public bool HasGroupChangedDueToDelink { get; private set; } 186 public bool HasGroupChangedDueToDelink { get; set; }
135 187
136 private bool isTimeToPersist() 188 private bool isTimeToPersist()
137 { 189 {
@@ -141,8 +193,19 @@ namespace OpenSim.Region.Framework.Scenes
141 return false; 193 return false;
142 if (m_scene.ShuttingDown) 194 if (m_scene.ShuttingDown)
143 return true; 195 return true;
196
197 if (m_minPersistTime == 0 || m_maxPersistTime == 0)
198 {
199 m_maxPersistTime = m_scene.m_persistAfter;
200 m_minPersistTime = m_scene.m_dontPersistBefore;
201 }
202
144 long currentTime = DateTime.Now.Ticks; 203 long currentTime = DateTime.Now.Ticks;
145 if (currentTime - timeLastChanged > m_scene.m_dontPersistBefore || currentTime - timeFirstChanged > m_scene.m_persistAfter) 204
205 if (timeLastChanged == 0) timeLastChanged = currentTime;
206 if (timeFirstChanged == 0) timeFirstChanged = currentTime;
207
208 if (currentTime - timeLastChanged > m_minPersistTime || currentTime - timeFirstChanged > m_maxPersistTime)
146 return true; 209 return true;
147 return false; 210 return false;
148 } 211 }
@@ -247,10 +310,10 @@ namespace OpenSim.Region.Framework.Scenes
247 310
248 private bool m_scriptListens_atTarget; 311 private bool m_scriptListens_atTarget;
249 private bool m_scriptListens_notAtTarget; 312 private bool m_scriptListens_notAtTarget;
250
251 private bool m_scriptListens_atRotTarget; 313 private bool m_scriptListens_atRotTarget;
252 private bool m_scriptListens_notAtRotTarget; 314 private bool m_scriptListens_notAtRotTarget;
253 315
316 public bool m_dupeInProgress = false;
254 internal Dictionary<UUID, string> m_savedScriptState; 317 internal Dictionary<UUID, string> m_savedScriptState;
255 318
256 #region Properties 319 #region Properties
@@ -281,6 +344,16 @@ namespace OpenSim.Region.Framework.Scenes
281 get { return m_parts.Count; } 344 get { return m_parts.Count; }
282 } 345 }
283 346
347// protected Quaternion m_rotation = Quaternion.Identity;
348//
349// public virtual Quaternion Rotation
350// {
351// get { return m_rotation; }
352// set {
353// m_rotation = value;
354// }
355// }
356
284 public Quaternion GroupRotation 357 public Quaternion GroupRotation
285 { 358 {
286 get { return m_rootPart.RotationOffset; } 359 get { return m_rootPart.RotationOffset; }
@@ -389,7 +462,11 @@ namespace OpenSim.Region.Framework.Scenes
389 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 462 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
390 } 463 }
391 } 464 }
392 465
466 foreach (SceneObjectPart part in m_parts.GetArray())
467 {
468 part.IgnoreUndoUpdate = true;
469 }
393 if (RootPart.GetStatusSandbox()) 470 if (RootPart.GetStatusSandbox())
394 { 471 {
395 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) 472 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -403,10 +480,30 @@ namespace OpenSim.Region.Framework.Scenes
403 return; 480 return;
404 } 481 }
405 } 482 }
406
407 SceneObjectPart[] parts = m_parts.GetArray(); 483 SceneObjectPart[] parts = m_parts.GetArray();
408 for (int i = 0; i < parts.Length; i++) 484 bool triggerScriptEvent = m_rootPart.GroupPosition != val;
409 parts[i].GroupPosition = val; 485 if (m_dupeInProgress)
486 triggerScriptEvent = false;
487 foreach (SceneObjectPart part in parts)
488 {
489 part.GroupPosition = val;
490 if (triggerScriptEvent)
491 part.TriggerScriptChangedEvent(Changed.POSITION);
492 }
493 if (!m_dupeInProgress)
494 {
495 foreach (ScenePresence av in m_linkedAvatars)
496 {
497 SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
498 if (m_parts.TryGetValue(p.UUID, out p))
499 {
500 Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
501 av.AbsolutePosition += offset;
502 av.ParentPosition = p.GetWorldPosition(); //ParentPosition gets cleared by AbsolutePosition
503 av.SendAvatarDataToAllAgents();
504 }
505 }
506 }
410 507
411 //if (m_rootPart.PhysActor != null) 508 //if (m_rootPart.PhysActor != null)
412 //{ 509 //{
@@ -565,6 +662,7 @@ namespace OpenSim.Region.Framework.Scenes
565 /// </summary> 662 /// </summary>
566 public SceneObjectGroup() 663 public SceneObjectGroup()
567 { 664 {
665
568 } 666 }
569 667
570 /// <summary> 668 /// <summary>
@@ -581,7 +679,7 @@ namespace OpenSim.Region.Framework.Scenes
581 /// Constructor. This object is added to the scene later via AttachToScene() 679 /// Constructor. This object is added to the scene later via AttachToScene()
582 /// </summary> 680 /// </summary>
583 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 681 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
584 { 682 {
585 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero)); 683 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero));
586 } 684 }
587 685
@@ -629,6 +727,9 @@ namespace OpenSim.Region.Framework.Scenes
629 /// </summary> 727 /// </summary>
630 public virtual void AttachToBackup() 728 public virtual void AttachToBackup()
631 { 729 {
730 if (IsAttachment) return;
731 m_scene.SceneGraph.FireAttachToBackup(this);
732
632 if (InSceneBackup) 733 if (InSceneBackup)
633 { 734 {
634 //m_log.DebugFormat( 735 //m_log.DebugFormat(
@@ -671,6 +772,9 @@ namespace OpenSim.Region.Framework.Scenes
671 772
672 ApplyPhysics(); 773 ApplyPhysics();
673 774
775 if (RootPart.PhysActor != null)
776 RootPart.Buoyancy = RootPart.Buoyancy;
777
674 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled 778 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
675 // for the same object with very different properties. The caller must schedule the update. 779 // for the same object with very different properties. The caller must schedule the update.
676 //ScheduleGroupForFullUpdate(); 780 //ScheduleGroupForFullUpdate();
@@ -686,6 +790,10 @@ namespace OpenSim.Region.Framework.Scenes
686 EntityIntersection result = new EntityIntersection(); 790 EntityIntersection result = new EntityIntersection();
687 791
688 SceneObjectPart[] parts = m_parts.GetArray(); 792 SceneObjectPart[] parts = m_parts.GetArray();
793
794 // Find closest hit here
795 float idist = float.MaxValue;
796
689 for (int i = 0; i < parts.Length; i++) 797 for (int i = 0; i < parts.Length; i++)
690 { 798 {
691 SceneObjectPart part = parts[i]; 799 SceneObjectPart part = parts[i];
@@ -700,11 +808,6 @@ namespace OpenSim.Region.Framework.Scenes
700 808
701 EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation, frontFacesOnly, faceCenters); 809 EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation, frontFacesOnly, faceCenters);
702 810
703 // This may need to be updated to the maximum draw distance possible..
704 // We might (and probably will) be checking for prim creation from other sims
705 // when the camera crosses the border.
706 float idist = Constants.RegionSize;
707
708 if (inter.HitTF) 811 if (inter.HitTF)
709 { 812 {
710 // We need to find the closest prim to return to the testcaller along the ray 813 // We need to find the closest prim to return to the testcaller along the ray
@@ -715,10 +818,11 @@ namespace OpenSim.Region.Framework.Scenes
715 result.obj = part; 818 result.obj = part;
716 result.normal = inter.normal; 819 result.normal = inter.normal;
717 result.distance = inter.distance; 820 result.distance = inter.distance;
821
822 idist = inter.distance;
718 } 823 }
719 } 824 }
720 } 825 }
721
722 return result; 826 return result;
723 } 827 }
724 828
@@ -738,17 +842,19 @@ namespace OpenSim.Region.Framework.Scenes
738 minZ = 8192f; 842 minZ = 8192f;
739 843
740 SceneObjectPart[] parts = m_parts.GetArray(); 844 SceneObjectPart[] parts = m_parts.GetArray();
741 for (int i = 0; i < parts.Length; i++) 845 foreach (SceneObjectPart part in parts)
742 { 846 {
743 SceneObjectPart part = parts[i];
744
745 Vector3 worldPos = part.GetWorldPosition(); 847 Vector3 worldPos = part.GetWorldPosition();
746 Vector3 offset = worldPos - AbsolutePosition; 848 Vector3 offset = worldPos - AbsolutePosition;
747 Quaternion worldRot; 849 Quaternion worldRot;
748 if (part.ParentID == 0) 850 if (part.ParentID == 0)
851 {
749 worldRot = part.RotationOffset; 852 worldRot = part.RotationOffset;
853 }
750 else 854 else
855 {
751 worldRot = part.GetWorldRotation(); 856 worldRot = part.GetWorldRotation();
857 }
752 858
753 Vector3 frontTopLeft; 859 Vector3 frontTopLeft;
754 Vector3 frontTopRight; 860 Vector3 frontTopRight;
@@ -760,6 +866,8 @@ namespace OpenSim.Region.Framework.Scenes
760 Vector3 backBottomLeft; 866 Vector3 backBottomLeft;
761 Vector3 backBottomRight; 867 Vector3 backBottomRight;
762 868
869 // Vector3[] corners = new Vector3[8];
870
763 Vector3 orig = Vector3.Zero; 871 Vector3 orig = Vector3.Zero;
764 872
765 frontTopLeft.X = orig.X - (part.Scale.X / 2); 873 frontTopLeft.X = orig.X - (part.Scale.X / 2);
@@ -794,6 +902,38 @@ namespace OpenSim.Region.Framework.Scenes
794 backBottomRight.Y = orig.Y + (part.Scale.Y / 2); 902 backBottomRight.Y = orig.Y + (part.Scale.Y / 2);
795 backBottomRight.Z = orig.Z - (part.Scale.Z / 2); 903 backBottomRight.Z = orig.Z - (part.Scale.Z / 2);
796 904
905
906
907 //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
908 //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
909 //m_log.InfoFormat("pre corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
910 //m_log.InfoFormat("pre corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
911 //m_log.InfoFormat("pre corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
912 //m_log.InfoFormat("pre corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
913 //m_log.InfoFormat("pre corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
914 //m_log.InfoFormat("pre corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
915
916 //for (int i = 0; i < 8; i++)
917 //{
918 // corners[i] = corners[i] * worldRot;
919 // corners[i] += offset;
920
921 // if (corners[i].X > maxX)
922 // maxX = corners[i].X;
923 // if (corners[i].X < minX)
924 // minX = corners[i].X;
925
926 // if (corners[i].Y > maxY)
927 // maxY = corners[i].Y;
928 // if (corners[i].Y < minY)
929 // minY = corners[i].Y;
930
931 // if (corners[i].Z > maxZ)
932 // maxZ = corners[i].Y;
933 // if (corners[i].Z < minZ)
934 // minZ = corners[i].Z;
935 //}
936
797 frontTopLeft = frontTopLeft * worldRot; 937 frontTopLeft = frontTopLeft * worldRot;
798 frontTopRight = frontTopRight * worldRot; 938 frontTopRight = frontTopRight * worldRot;
799 frontBottomLeft = frontBottomLeft * worldRot; 939 frontBottomLeft = frontBottomLeft * worldRot;
@@ -815,6 +955,15 @@ namespace OpenSim.Region.Framework.Scenes
815 backTopLeft += offset; 955 backTopLeft += offset;
816 backTopRight += offset; 956 backTopRight += offset;
817 957
958 //m_log.InfoFormat("corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
959 //m_log.InfoFormat("corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
960 //m_log.InfoFormat("corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
961 //m_log.InfoFormat("corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
962 //m_log.InfoFormat("corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
963 //m_log.InfoFormat("corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
964 //m_log.InfoFormat("corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
965 //m_log.InfoFormat("corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
966
818 if (frontTopRight.X > maxX) 967 if (frontTopRight.X > maxX)
819 maxX = frontTopRight.X; 968 maxX = frontTopRight.X;
820 if (frontTopLeft.X > maxX) 969 if (frontTopLeft.X > maxX)
@@ -960,15 +1109,20 @@ namespace OpenSim.Region.Framework.Scenes
960 1109
961 public void SaveScriptedState(XmlTextWriter writer) 1110 public void SaveScriptedState(XmlTextWriter writer)
962 { 1111 {
1112 SaveScriptedState(writer, false);
1113 }
1114
1115 public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
1116 {
963 XmlDocument doc = new XmlDocument(); 1117 XmlDocument doc = new XmlDocument();
964 Dictionary<UUID,string> states = new Dictionary<UUID,string>(); 1118 Dictionary<UUID,string> states = new Dictionary<UUID,string>();
965 1119
966 SceneObjectPart[] parts = m_parts.GetArray(); 1120 SceneObjectPart[] parts = m_parts.GetArray();
967 for (int i = 0; i < parts.Length; i++) 1121 for (int i = 0; i < parts.Length; i++)
968 { 1122 {
969 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(); 1123 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs);
970 foreach (KeyValuePair<UUID, string> kvp in pstates) 1124 foreach (KeyValuePair<UUID, string> kvp in pstates)
971 states.Add(kvp.Key, kvp.Value); 1125 states[kvp.Key] = kvp.Value;
972 } 1126 }
973 1127
974 if (states.Count > 0) 1128 if (states.Count > 0)
@@ -988,6 +1142,168 @@ namespace OpenSim.Region.Framework.Scenes
988 } 1142 }
989 1143
990 /// <summary> 1144 /// <summary>
1145 /// Add the avatar to this linkset (avatar is sat).
1146 /// </summary>
1147 /// <param name="agentID"></param>
1148 public void AddAvatar(UUID agentID)
1149 {
1150 ScenePresence presence;
1151 if (m_scene.TryGetScenePresence(agentID, out presence))
1152 {
1153 if (!m_linkedAvatars.Contains(presence))
1154 {
1155 m_linkedAvatars.Add(presence);
1156 }
1157 }
1158 }
1159
1160 /// <summary>
1161 /// Delete the avatar from this linkset (avatar is unsat).
1162 /// </summary>
1163 /// <param name="agentID"></param>
1164 public void DeleteAvatar(UUID agentID)
1165 {
1166 ScenePresence presence;
1167 if (m_scene.TryGetScenePresence(agentID, out presence))
1168 {
1169 if (m_linkedAvatars.Contains(presence))
1170 {
1171 m_linkedAvatars.Remove(presence);
1172 }
1173 }
1174 }
1175
1176 /// <summary>
1177 /// Returns the list of linked presences (avatars sat on this group)
1178 /// </summary>
1179 /// <param name="agentID"></param>
1180 public List<ScenePresence> GetLinkedAvatars()
1181 {
1182 return m_linkedAvatars;
1183 }
1184
1185 /// <summary>
1186 /// Attach this scene object to the given avatar.
1187 /// </summary>
1188 /// <param name="agentID"></param>
1189 /// <param name="attachmentpoint"></param>
1190 /// <param name="AttachOffset"></param>
1191 private void AttachToAgent(
1192 ScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
1193 {
1194 if (avatar != null)
1195 {
1196 // don't attach attachments to child agents
1197 if (avatar.IsChildAgent) return;
1198
1199 // Remove from database and parcel prim count
1200 m_scene.DeleteFromStorage(so.UUID);
1201 m_scene.EventManager.TriggerParcelPrimCountTainted();
1202
1203 so.AttachedAvatar = avatar.UUID;
1204
1205 if (so.RootPart.PhysActor != null)
1206 {
1207 m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
1208 so.RootPart.PhysActor = null;
1209 }
1210
1211 so.AbsolutePosition = attachOffset;
1212 so.RootPart.AttachedPos = attachOffset;
1213 so.IsAttachment = true;
1214 so.RootPart.SetParentLocalId(avatar.LocalId);
1215 so.AttachmentPoint = attachmentpoint;
1216
1217 avatar.AddAttachment(this);
1218
1219 if (!silent)
1220 {
1221 // Killing it here will cause the client to deselect it
1222 // It then reappears on the avatar, deselected
1223 // through the full update below
1224 //
1225 if (IsSelected)
1226 {
1227 m_scene.SendKillObject(new List<uint> { m_rootPart.LocalId });
1228 }
1229
1230 IsSelected = false; // fudge....
1231 ScheduleGroupForFullUpdate();
1232 }
1233 }
1234 else
1235 {
1236 m_log.WarnFormat(
1237 "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
1238 UUID, avatar.ControllingClient.AgentId, Scene.RegionInfo.RegionName);
1239 }
1240 }
1241
1242 public byte GetAttachmentPoint()
1243 {
1244 return m_rootPart.Shape.State;
1245 }
1246
1247 public void DetachToGround()
1248 {
1249 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1250 if (avatar == null)
1251 return;
1252
1253 avatar.RemoveAttachment(this);
1254
1255 Vector3 detachedpos = new Vector3(127f,127f,127f);
1256 if (avatar == null)
1257 return;
1258
1259 detachedpos = avatar.AbsolutePosition;
1260 RootPart.FromItemID = UUID.Zero;
1261
1262 AbsolutePosition = detachedpos;
1263 AttachedAvatar = UUID.Zero;
1264
1265 //SceneObjectPart[] parts = m_parts.GetArray();
1266 //for (int i = 0; i < parts.Length; i++)
1267 // parts[i].AttachedAvatar = UUID.Zero;
1268
1269 m_rootPart.SetParentLocalId(0);
1270 AttachmentPoint = (byte)0;
1271 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
1272 HasGroupChanged = true;
1273 RootPart.Rezzed = DateTime.Now;
1274 RootPart.RemFlag(PrimFlags.TemporaryOnRez);
1275 AttachToBackup();
1276 m_scene.EventManager.TriggerParcelPrimCountTainted();
1277 m_rootPart.ScheduleFullUpdate();
1278 m_rootPart.ClearUndoState();
1279 }
1280
1281 public void DetachToInventoryPrep()
1282 {
1283 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1284 //Vector3 detachedpos = new Vector3(127f, 127f, 127f);
1285 if (avatar != null)
1286 {
1287 //detachedpos = avatar.AbsolutePosition;
1288 avatar.RemoveAttachment(this);
1289 }
1290
1291 AttachedAvatar = UUID.Zero;
1292
1293 /*SceneObjectPart[] parts = m_parts.GetArray();
1294 for (int i = 0; i < parts.Length; i++)
1295 parts[i].AttachedAvatar = UUID.Zero;*/
1296
1297 m_rootPart.SetParentLocalId(0);
1298 //m_rootPart.SetAttachmentPoint((byte)0);
1299 IsAttachment = false;
1300 AbsolutePosition = m_rootPart.AttachedPos;
1301 //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
1302 //AttachToBackup();
1303 //m_rootPart.ScheduleFullUpdate();
1304 }
1305
1306 /// <summary>
991 /// 1307 ///
992 /// </summary> 1308 /// </summary>
993 /// <param name="part"></param> 1309 /// <param name="part"></param>
@@ -1037,7 +1353,10 @@ namespace OpenSim.Region.Framework.Scenes
1037 public void AddPart(SceneObjectPart part) 1353 public void AddPart(SceneObjectPart part)
1038 { 1354 {
1039 part.SetParent(this); 1355 part.SetParent(this);
1040 part.LinkNum = m_parts.Add(part.UUID, part); 1356 m_parts.Add(part.UUID, part);
1357
1358 part.LinkNum = m_parts.Count;
1359
1041 if (part.LinkNum == 2) 1360 if (part.LinkNum == 2)
1042 RootPart.LinkNum = 1; 1361 RootPart.LinkNum = 1;
1043 } 1362 }
@@ -1145,6 +1464,11 @@ namespace OpenSim.Region.Framework.Scenes
1145 /// <param name="silent">If true then deletion is not broadcast to clients</param> 1464 /// <param name="silent">If true then deletion is not broadcast to clients</param>
1146 public void DeleteGroupFromScene(bool silent) 1465 public void DeleteGroupFromScene(bool silent)
1147 { 1466 {
1467 // We need to keep track of this state in case this group is still queued for backup.
1468 IsDeleted = true;
1469
1470 DetachFromBackup();
1471
1148 SceneObjectPart[] parts = m_parts.GetArray(); 1472 SceneObjectPart[] parts = m_parts.GetArray();
1149 for (int i = 0; i < parts.Length; i++) 1473 for (int i = 0; i < parts.Length; i++)
1150 { 1474 {
@@ -1167,6 +1491,8 @@ namespace OpenSim.Region.Framework.Scenes
1167 } 1491 }
1168 }); 1492 });
1169 } 1493 }
1494
1495
1170 } 1496 }
1171 1497
1172 public void AddScriptLPS(int count) 1498 public void AddScriptLPS(int count)
@@ -1262,7 +1588,12 @@ namespace OpenSim.Region.Framework.Scenes
1262 1588
1263 public void SetOwnerId(UUID userId) 1589 public void SetOwnerId(UUID userId)
1264 { 1590 {
1265 ForEachPart(delegate(SceneObjectPart part) { part.OwnerID = userId; }); 1591 ForEachPart(delegate(SceneObjectPart part)
1592 {
1593
1594 part.OwnerID = userId;
1595
1596 });
1266 } 1597 }
1267 1598
1268 public void ForEachPart(Action<SceneObjectPart> whatToDo) 1599 public void ForEachPart(Action<SceneObjectPart> whatToDo)
@@ -1294,11 +1625,17 @@ namespace OpenSim.Region.Framework.Scenes
1294 return; 1625 return;
1295 } 1626 }
1296 1627
1628 if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
1629 return;
1630
1297 // Since this is the top of the section of call stack for backing up a particular scene object, don't let 1631 // Since this is the top of the section of call stack for backing up a particular scene object, don't let
1298 // any exception propogate upwards. 1632 // any exception propogate upwards.
1299 try 1633 try
1300 { 1634 {
1301 if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart 1635 if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
1636 m_scene.LoginsDisabled || // We're starting up or doing maintenance, don't mess with things
1637 m_scene.LoadingPrims) // Land may not be valid yet
1638
1302 { 1639 {
1303 ILandObject parcel = m_scene.LandChannel.GetLandObject( 1640 ILandObject parcel = m_scene.LandChannel.GetLandObject(
1304 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); 1641 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
@@ -1325,6 +1662,7 @@ namespace OpenSim.Region.Framework.Scenes
1325 } 1662 }
1326 } 1663 }
1327 } 1664 }
1665
1328 } 1666 }
1329 1667
1330 if (m_scene.UseBackup && HasGroupChanged) 1668 if (m_scene.UseBackup && HasGroupChanged)
@@ -1332,6 +1670,20 @@ namespace OpenSim.Region.Framework.Scenes
1332 // don't backup while it's selected or you're asking for changes mid stream. 1670 // don't backup while it's selected or you're asking for changes mid stream.
1333 if (isTimeToPersist() || forcedBackup) 1671 if (isTimeToPersist() || forcedBackup)
1334 { 1672 {
1673 if (m_rootPart.PhysActor != null &&
1674 (!m_rootPart.PhysActor.IsPhysical))
1675 {
1676 // Possible ghost prim
1677 if (m_rootPart.PhysActor.Position != m_rootPart.GroupPosition)
1678 {
1679 foreach (SceneObjectPart part in m_parts.GetArray())
1680 {
1681 // Re-set physics actor positions and
1682 // orientations
1683 part.GroupPosition = m_rootPart.GroupPosition;
1684 }
1685 }
1686 }
1335// m_log.DebugFormat( 1687// m_log.DebugFormat(
1336// "[SCENE]: Storing {0}, {1} in {2}", 1688// "[SCENE]: Storing {0}, {1} in {2}",
1337// Name, UUID, m_scene.RegionInfo.RegionName); 1689// Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1415,7 +1767,7 @@ namespace OpenSim.Region.Framework.Scenes
1415 // This is only necessary when userExposed is false! 1767 // This is only necessary when userExposed is false!
1416 1768
1417 bool previousAttachmentStatus = dupe.IsAttachment; 1769 bool previousAttachmentStatus = dupe.IsAttachment;
1418 1770
1419 if (!userExposed) 1771 if (!userExposed)
1420 dupe.IsAttachment = true; 1772 dupe.IsAttachment = true;
1421 1773
@@ -1433,11 +1785,11 @@ namespace OpenSim.Region.Framework.Scenes
1433 dupe.m_rootPart.TrimPermissions(); 1785 dupe.m_rootPart.TrimPermissions();
1434 1786
1435 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray()); 1787 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray());
1436 1788
1437 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2) 1789 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
1438 { 1790 {
1439 return p1.LinkNum.CompareTo(p2.LinkNum); 1791 return p1.LinkNum.CompareTo(p2.LinkNum);
1440 } 1792 }
1441 ); 1793 );
1442 1794
1443 foreach (SceneObjectPart part in partList) 1795 foreach (SceneObjectPart part in partList)
@@ -1457,7 +1809,7 @@ namespace OpenSim.Region.Framework.Scenes
1457 if (part.PhysActor != null && userExposed) 1809 if (part.PhysActor != null && userExposed)
1458 { 1810 {
1459 PrimitiveBaseShape pbs = newPart.Shape; 1811 PrimitiveBaseShape pbs = newPart.Shape;
1460 1812
1461 newPart.PhysActor 1813 newPart.PhysActor
1462 = m_scene.PhysicsScene.AddPrimShape( 1814 = m_scene.PhysicsScene.AddPrimShape(
1463 string.Format("{0}/{1}", newPart.Name, newPart.UUID), 1815 string.Format("{0}/{1}", newPart.Name, newPart.UUID),
@@ -1467,11 +1819,11 @@ namespace OpenSim.Region.Framework.Scenes
1467 newPart.RotationOffset, 1819 newPart.RotationOffset,
1468 part.PhysActor.IsPhysical, 1820 part.PhysActor.IsPhysical,
1469 newPart.LocalId); 1821 newPart.LocalId);
1470 1822
1471 newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true); 1823 newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
1472 } 1824 }
1473 } 1825 }
1474 1826
1475 if (userExposed) 1827 if (userExposed)
1476 { 1828 {
1477 dupe.UpdateParentIDs(); 1829 dupe.UpdateParentIDs();
@@ -1586,6 +1938,7 @@ namespace OpenSim.Region.Framework.Scenes
1586 return Vector3.Zero; 1938 return Vector3.Zero;
1587 } 1939 }
1588 1940
1941 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
1589 public void moveToTarget(Vector3 target, float tau) 1942 public void moveToTarget(Vector3 target, float tau)
1590 { 1943 {
1591 if (IsAttachment) 1944 if (IsAttachment)
@@ -1613,6 +1966,46 @@ namespace OpenSim.Region.Framework.Scenes
1613 RootPart.PhysActor.PIDActive = false; 1966 RootPart.PhysActor.PIDActive = false;
1614 } 1967 }
1615 1968
1969 public void rotLookAt(Quaternion target, float strength, float damping)
1970 {
1971 SceneObjectPart rootpart = m_rootPart;
1972 if (rootpart != null)
1973 {
1974 if (IsAttachment)
1975 {
1976 /*
1977 ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
1978 if (avatar != null)
1979 {
1980 Rotate the Av?
1981 } */
1982 }
1983 else
1984 {
1985 if (rootpart.PhysActor != null)
1986 { // APID must be implemented in your physics system for this to function.
1987 rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
1988 rootpart.PhysActor.APIDStrength = strength;
1989 rootpart.PhysActor.APIDDamping = damping;
1990 rootpart.PhysActor.APIDActive = true;
1991 }
1992 }
1993 }
1994 }
1995
1996 public void stopLookAt()
1997 {
1998 SceneObjectPart rootpart = m_rootPart;
1999 if (rootpart != null)
2000 {
2001 if (rootpart.PhysActor != null)
2002 { // APID must be implemented in your physics system for this to function.
2003 rootpart.PhysActor.APIDActive = false;
2004 }
2005 }
2006
2007 }
2008
1616 /// <summary> 2009 /// <summary>
1617 /// Uses a PID to attempt to clamp the object on the Z axis at the given height over tau seconds. 2010 /// Uses a PID to attempt to clamp the object on the Z axis at the given height over tau seconds.
1618 /// </summary> 2011 /// </summary>
@@ -1668,6 +2061,8 @@ namespace OpenSim.Region.Framework.Scenes
1668 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) 2061 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
1669 { 2062 {
1670 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed); 2063 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
2064 newPart.SetParent(this);
2065
1671 AddPart(newPart); 2066 AddPart(newPart);
1672 2067
1673 SetPartAsNonRoot(newPart); 2068 SetPartAsNonRoot(newPart);
@@ -1796,11 +2191,11 @@ namespace OpenSim.Region.Framework.Scenes
1796 /// Immediately send a full update for this scene object. 2191 /// Immediately send a full update for this scene object.
1797 /// </summary> 2192 /// </summary>
1798 public void SendGroupFullUpdate() 2193 public void SendGroupFullUpdate()
1799 { 2194 {
1800 if (IsDeleted) 2195 if (IsDeleted)
1801 return; 2196 return;
1802 2197
1803// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID); 2198// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
1804 2199
1805 RootPart.SendFullUpdateToAllClients(); 2200 RootPart.SendFullUpdateToAllClients();
1806 2201
@@ -2001,7 +2396,7 @@ namespace OpenSim.Region.Framework.Scenes
2001 objectGroup.IsDeleted = true; 2396 objectGroup.IsDeleted = true;
2002 2397
2003 objectGroup.m_parts.Clear(); 2398 objectGroup.m_parts.Clear();
2004 2399
2005 // Can't do this yet since backup still makes use of the root part without any synchronization 2400 // Can't do this yet since backup still makes use of the root part without any synchronization
2006// objectGroup.m_rootPart = null; 2401// objectGroup.m_rootPart = null;
2007 2402
@@ -2135,6 +2530,7 @@ namespace OpenSim.Region.Framework.Scenes
2135 /// <param name="objectGroup"></param> 2530 /// <param name="objectGroup"></param>
2136 public virtual void DetachFromBackup() 2531 public virtual void DetachFromBackup()
2137 { 2532 {
2533 m_scene.SceneGraph.FireDetachFromBackup(this);
2138 if (m_isBackedUp && Scene != null) 2534 if (m_isBackedUp && Scene != null)
2139 m_scene.EventManager.OnBackup -= ProcessBackup; 2535 m_scene.EventManager.OnBackup -= ProcessBackup;
2140 2536
@@ -2153,7 +2549,8 @@ namespace OpenSim.Region.Framework.Scenes
2153 2549
2154 axPos *= parentRot; 2550 axPos *= parentRot;
2155 part.OffsetPosition = axPos; 2551 part.OffsetPosition = axPos;
2156 part.GroupPosition = oldGroupPosition + part.OffsetPosition; 2552 Vector3 newPos = oldGroupPosition + part.OffsetPosition;
2553 part.GroupPosition = newPos;
2157 part.OffsetPosition = Vector3.Zero; 2554 part.OffsetPosition = Vector3.Zero;
2158 part.RotationOffset = worldRot; 2555 part.RotationOffset = worldRot;
2159 2556
@@ -2164,7 +2561,7 @@ namespace OpenSim.Region.Framework.Scenes
2164 2561
2165 part.LinkNum = linkNum; 2562 part.LinkNum = linkNum;
2166 2563
2167 part.OffsetPosition = part.GroupPosition - AbsolutePosition; 2564 part.OffsetPosition = newPos - AbsolutePosition;
2168 2565
2169 Quaternion rootRotation = m_rootPart.RotationOffset; 2566 Quaternion rootRotation = m_rootPart.RotationOffset;
2170 2567
@@ -2174,7 +2571,7 @@ namespace OpenSim.Region.Framework.Scenes
2174 2571
2175 parentRot = m_rootPart.RotationOffset; 2572 parentRot = m_rootPart.RotationOffset;
2176 oldRot = part.RotationOffset; 2573 oldRot = part.RotationOffset;
2177 Quaternion newRot = Quaternion.Inverse(parentRot) * oldRot; 2574 Quaternion newRot = Quaternion.Inverse(parentRot) * worldRot;
2178 part.RotationOffset = newRot; 2575 part.RotationOffset = newRot;
2179 } 2576 }
2180 2577
@@ -2421,8 +2818,12 @@ namespace OpenSim.Region.Framework.Scenes
2421 } 2818 }
2422 } 2819 }
2423 2820
2821 RootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect);
2424 for (int i = 0; i < parts.Length; i++) 2822 for (int i = 0; i < parts.Length; i++)
2425 parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect); 2823 {
2824 if (parts[i] != RootPart)
2825 parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect);
2826 }
2426 } 2827 }
2427 } 2828 }
2428 2829
@@ -2435,6 +2836,17 @@ namespace OpenSim.Region.Framework.Scenes
2435 } 2836 }
2436 } 2837 }
2437 2838
2839
2840
2841 /// <summary>
2842 /// Gets the number of parts
2843 /// </summary>
2844 /// <returns></returns>
2845 public int GetPartCount()
2846 {
2847 return Parts.Count();
2848 }
2849
2438 /// <summary> 2850 /// <summary>
2439 /// Update the texture entry for this part 2851 /// Update the texture entry for this part
2440 /// </summary> 2852 /// </summary>
@@ -2496,7 +2908,6 @@ namespace OpenSim.Region.Framework.Scenes
2496 { 2908 {
2497// m_log.DebugFormat( 2909// m_log.DebugFormat(
2498// "[SCENE OBJECT GROUP]: Group resizing {0} {1} from {2} to {3}", Name, LocalId, RootPart.Scale, scale); 2910// "[SCENE OBJECT GROUP]: Group resizing {0} {1} from {2} to {3}", Name, LocalId, RootPart.Scale, scale);
2499
2500 RootPart.StoreUndoState(true); 2911 RootPart.StoreUndoState(true);
2501 2912
2502 scale.X = Math.Min(scale.X, Scene.m_maxNonphys); 2913 scale.X = Math.Min(scale.X, Scene.m_maxNonphys);
@@ -2597,7 +3008,6 @@ namespace OpenSim.Region.Framework.Scenes
2597 prevScale.X *= x; 3008 prevScale.X *= x;
2598 prevScale.Y *= y; 3009 prevScale.Y *= y;
2599 prevScale.Z *= z; 3010 prevScale.Z *= z;
2600
2601// RootPart.IgnoreUndoUpdate = true; 3011// RootPart.IgnoreUndoUpdate = true;
2602 RootPart.Resize(prevScale); 3012 RootPart.Resize(prevScale);
2603// RootPart.IgnoreUndoUpdate = false; 3013// RootPart.IgnoreUndoUpdate = false;
@@ -2628,7 +3038,9 @@ namespace OpenSim.Region.Framework.Scenes
2628 } 3038 }
2629 3039
2630// obPart.IgnoreUndoUpdate = false; 3040// obPart.IgnoreUndoUpdate = false;
2631// obPart.StoreUndoState(); 3041 HasGroupChanged = true;
3042 m_rootPart.TriggerScriptChangedEvent(Changed.SCALE);
3043 ScheduleGroupForTerseUpdate();
2632 } 3044 }
2633 3045
2634// m_log.DebugFormat( 3046// m_log.DebugFormat(
@@ -2688,9 +3100,9 @@ namespace OpenSim.Region.Framework.Scenes
2688 { 3100 {
2689 SceneObjectPart part = GetChildPart(localID); 3101 SceneObjectPart part = GetChildPart(localID);
2690 3102
2691// SceneObjectPart[] parts = m_parts.GetArray(); 3103 SceneObjectPart[] parts = m_parts.GetArray();
2692// for (int i = 0; i < parts.Length; i++) 3104 for (int i = 0; i < parts.Length; i++)
2693// parts[i].StoreUndoState(); 3105 parts[i].StoreUndoState();
2694 3106
2695 if (part != null) 3107 if (part != null)
2696 { 3108 {
@@ -2746,10 +3158,27 @@ namespace OpenSim.Region.Framework.Scenes
2746 obPart.OffsetPosition = obPart.OffsetPosition + diff; 3158 obPart.OffsetPosition = obPart.OffsetPosition + diff;
2747 } 3159 }
2748 3160
2749 AbsolutePosition = newPos; 3161 //We have to set undoing here because otherwise an undo state will be saved
3162 if (!m_rootPart.Undoing)
3163 {
3164 m_rootPart.Undoing = true;
3165 AbsolutePosition = newPos;
3166 m_rootPart.Undoing = false;
3167 }
3168 else
3169 {
3170 AbsolutePosition = newPos;
3171 }
2750 3172
2751 HasGroupChanged = true; 3173 HasGroupChanged = true;
2752 ScheduleGroupForTerseUpdate(); 3174 if (m_rootPart.Undoing)
3175 {
3176 ScheduleGroupForFullUpdate();
3177 }
3178 else
3179 {
3180 ScheduleGroupForTerseUpdate();
3181 }
2753 } 3182 }
2754 3183
2755 #endregion 3184 #endregion
@@ -2826,10 +3255,7 @@ namespace OpenSim.Region.Framework.Scenes
2826 public void UpdateSingleRotation(Quaternion rot, uint localID) 3255 public void UpdateSingleRotation(Quaternion rot, uint localID)
2827 { 3256 {
2828 SceneObjectPart part = GetChildPart(localID); 3257 SceneObjectPart part = GetChildPart(localID);
2829
2830 SceneObjectPart[] parts = m_parts.GetArray(); 3258 SceneObjectPart[] parts = m_parts.GetArray();
2831 for (int i = 0; i < parts.Length; i++)
2832 parts[i].StoreUndoState();
2833 3259
2834 if (part != null) 3260 if (part != null)
2835 { 3261 {
@@ -2867,7 +3293,16 @@ namespace OpenSim.Region.Framework.Scenes
2867 if (part.UUID == m_rootPart.UUID) 3293 if (part.UUID == m_rootPart.UUID)
2868 { 3294 {
2869 UpdateRootRotation(rot); 3295 UpdateRootRotation(rot);
2870 AbsolutePosition = pos; 3296 if (!m_rootPart.Undoing)
3297 {
3298 m_rootPart.Undoing = true;
3299 AbsolutePosition = pos;
3300 m_rootPart.Undoing = false;
3301 }
3302 else
3303 {
3304 AbsolutePosition = pos;
3305 }
2871 } 3306 }
2872 else 3307 else
2873 { 3308 {
@@ -2891,9 +3326,10 @@ namespace OpenSim.Region.Framework.Scenes
2891 3326
2892 Quaternion axRot = rot; 3327 Quaternion axRot = rot;
2893 Quaternion oldParentRot = m_rootPart.RotationOffset; 3328 Quaternion oldParentRot = m_rootPart.RotationOffset;
2894
2895 m_rootPart.StoreUndoState(); 3329 m_rootPart.StoreUndoState();
2896 m_rootPart.UpdateRotation(rot); 3330
3331 //Don't use UpdateRotation because it schedules an update prematurely
3332 m_rootPart.RotationOffset = rot;
2897 if (m_rootPart.PhysActor != null) 3333 if (m_rootPart.PhysActor != null)
2898 { 3334 {
2899 m_rootPart.PhysActor.Orientation = m_rootPart.RotationOffset; 3335 m_rootPart.PhysActor.Orientation = m_rootPart.RotationOffset;
@@ -2907,15 +3343,17 @@ namespace OpenSim.Region.Framework.Scenes
2907 if (prim.UUID != m_rootPart.UUID) 3343 if (prim.UUID != m_rootPart.UUID)
2908 { 3344 {
2909 prim.IgnoreUndoUpdate = true; 3345 prim.IgnoreUndoUpdate = true;
3346
3347 Quaternion NewRot = oldParentRot * prim.RotationOffset;
3348 NewRot = Quaternion.Inverse(axRot) * NewRot;
3349 prim.RotationOffset = NewRot;
3350
2910 Vector3 axPos = prim.OffsetPosition; 3351 Vector3 axPos = prim.OffsetPosition;
3352
2911 axPos *= oldParentRot; 3353 axPos *= oldParentRot;
2912 axPos *= Quaternion.Inverse(axRot); 3354 axPos *= Quaternion.Inverse(axRot);
2913 prim.OffsetPosition = axPos; 3355 prim.OffsetPosition = axPos;
2914 Quaternion primsRot = prim.RotationOffset; 3356
2915 Quaternion newRot = oldParentRot * primsRot;
2916 newRot = Quaternion.Inverse(axRot) * newRot;
2917 prim.RotationOffset = newRot;
2918 prim.ScheduleTerseUpdate();
2919 prim.IgnoreUndoUpdate = false; 3357 prim.IgnoreUndoUpdate = false;
2920 } 3358 }
2921 } 3359 }
@@ -2929,8 +3367,8 @@ namespace OpenSim.Region.Framework.Scenes
2929//// childpart.StoreUndoState(); 3367//// childpart.StoreUndoState();
2930// } 3368// }
2931// } 3369// }
2932 3370 HasGroupChanged = true;
2933 m_rootPart.ScheduleTerseUpdate(); 3371 ScheduleGroupForFullUpdate();
2934 3372
2935// m_log.DebugFormat( 3373// m_log.DebugFormat(
2936// "[SCENE OBJECT GROUP]: Updated root rotation of {0} {1} to {2}", 3374// "[SCENE OBJECT GROUP]: Updated root rotation of {0} {1} to {2}",
@@ -3158,7 +3596,6 @@ namespace OpenSim.Region.Framework.Scenes
3158 public float GetMass() 3596 public float GetMass()
3159 { 3597 {
3160 float retmass = 0f; 3598 float retmass = 0f;
3161
3162 SceneObjectPart[] parts = m_parts.GetArray(); 3599 SceneObjectPart[] parts = m_parts.GetArray();
3163 for (int i = 0; i < parts.Length; i++) 3600 for (int i = 0; i < parts.Length; i++)
3164 retmass += parts[i].GetMass(); 3601 retmass += parts[i].GetMass();
@@ -3254,6 +3691,14 @@ namespace OpenSim.Region.Framework.Scenes
3254 SetFromItemID(uuid); 3691 SetFromItemID(uuid);
3255 } 3692 }
3256 3693
3694 public void ResetOwnerChangeFlag()
3695 {
3696 ForEachPart(delegate(SceneObjectPart part)
3697 {
3698 part.ResetOwnerChangeFlag();
3699 });
3700 }
3701
3257 #endregion 3702 #endregion
3258 } 3703 }
3259} 3704}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ad3bcd5..b232855 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -62,7 +62,8 @@ namespace OpenSim.Region.Framework.Scenes
62 TELEPORT = 512, 62 TELEPORT = 512,
63 REGION_RESTART = 1024, 63 REGION_RESTART = 1024,
64 MEDIA = 2048, 64 MEDIA = 2048,
65 ANIMATION = 16384 65 ANIMATION = 16384,
66 POSITION = 32768
66 } 67 }
67 68
68 // I don't really know where to put this except here. 69 // I don't really know where to put this except here.
@@ -184,6 +185,15 @@ namespace OpenSim.Region.Framework.Scenes
184 185
185 public UUID FromFolderID; 186 public UUID FromFolderID;
186 187
188 // The following two are to hold the attachment data
189 // while an object is inworld
190 [XmlIgnore]
191 public byte AttachPoint = 0;
192
193 [XmlIgnore]
194 public Vector3 AttachOffset = Vector3.Zero;
195
196 [XmlIgnore]
187 public int STATUS_ROTATE_X; 197 public int STATUS_ROTATE_X;
188 198
189 public int STATUS_ROTATE_Y; 199 public int STATUS_ROTATE_Y;
@@ -210,8 +220,7 @@ namespace OpenSim.Region.Framework.Scenes
210 220
211 public Vector3 RotationAxis = Vector3.One; 221 public Vector3 RotationAxis = Vector3.One;
212 222
213 public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this 223 public bool VolumeDetectActive;
214 // Certainly this must be a persistant setting finally
215 224
216 public bool IsWaitingForFirstSpinUpdatePacket; 225 public bool IsWaitingForFirstSpinUpdatePacket;
217 226
@@ -251,6 +260,7 @@ namespace OpenSim.Region.Framework.Scenes
251 private Quaternion m_sitTargetOrientation = Quaternion.Identity; 260 private Quaternion m_sitTargetOrientation = Quaternion.Identity;
252 private Vector3 m_sitTargetPosition; 261 private Vector3 m_sitTargetPosition;
253 private string m_sitAnimation = "SIT"; 262 private string m_sitAnimation = "SIT";
263 private bool m_occupied; // KF if any av is sitting on this prim
254 private string m_text = String.Empty; 264 private string m_text = String.Empty;
255 private string m_touchName = String.Empty; 265 private string m_touchName = String.Empty;
256 private readonly Stack<UndoState> m_undo = new Stack<UndoState>(5); 266 private readonly Stack<UndoState> m_undo = new Stack<UndoState>(5);
@@ -283,6 +293,7 @@ namespace OpenSim.Region.Framework.Scenes
283 protected Vector3 m_lastAcceleration; 293 protected Vector3 m_lastAcceleration;
284 protected Vector3 m_lastAngularVelocity; 294 protected Vector3 m_lastAngularVelocity;
285 protected int m_lastTerseSent; 295 protected int m_lastTerseSent;
296 protected float m_buoyancy = 0.0f;
286 297
287 /// <summary> 298 /// <summary>
288 /// Stores media texture data 299 /// Stores media texture data
@@ -338,7 +349,7 @@ namespace OpenSim.Region.Framework.Scenes
338 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 349 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
339 Quaternion rotationOffset, Vector3 offsetPosition) : this() 350 Quaternion rotationOffset, Vector3 offsetPosition) : this()
340 { 351 {
341 m_name = "Primitive"; 352 m_name = "Object";
342 353
343 CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed); 354 CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
344 LastOwnerID = CreatorID = OwnerID = ownerID; 355 LastOwnerID = CreatorID = OwnerID = ownerID;
@@ -378,7 +389,7 @@ namespace OpenSim.Region.Framework.Scenes
378 private uint _ownerMask = (uint)PermissionMask.All; 389 private uint _ownerMask = (uint)PermissionMask.All;
379 private uint _groupMask = (uint)PermissionMask.None; 390 private uint _groupMask = (uint)PermissionMask.None;
380 private uint _everyoneMask = (uint)PermissionMask.None; 391 private uint _everyoneMask = (uint)PermissionMask.None;
381 private uint _nextOwnerMask = (uint)PermissionMask.All; 392 private uint _nextOwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer);
382 private PrimFlags _flags = PrimFlags.None; 393 private PrimFlags _flags = PrimFlags.None;
383 private DateTime m_expires; 394 private DateTime m_expires;
384 private DateTime m_rezzed; 395 private DateTime m_rezzed;
@@ -472,12 +483,16 @@ namespace OpenSim.Region.Framework.Scenes
472 } 483 }
473 484
474 /// <value> 485 /// <value>
475 /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes 486 /// Get the inventory list
476 /// </value> 487 /// </value>
477 public TaskInventoryDictionary TaskInventory 488 public TaskInventoryDictionary TaskInventory
478 { 489 {
479 get { return m_inventory.Items; } 490 get {
480 set { m_inventory.Items = value; } 491 return m_inventory.Items;
492 }
493 set {
494 m_inventory.Items = value;
495 }
481 } 496 }
482 497
483 /// <summary> 498 /// <summary>
@@ -621,14 +636,12 @@ namespace OpenSim.Region.Framework.Scenes
621 set { m_LoopSoundSlavePrims = value; } 636 set { m_LoopSoundSlavePrims = value; }
622 } 637 }
623 638
624
625 public Byte[] TextureAnimation 639 public Byte[] TextureAnimation
626 { 640 {
627 get { return m_TextureAnimation; } 641 get { return m_TextureAnimation; }
628 set { m_TextureAnimation = value; } 642 set { m_TextureAnimation = value; }
629 } 643 }
630 644
631
632 public Byte[] ParticleSystem 645 public Byte[] ParticleSystem
633 { 646 {
634 get { return m_particleSystem; } 647 get { return m_particleSystem; }
@@ -665,9 +678,11 @@ namespace OpenSim.Region.Framework.Scenes
665 { 678 {
666 // If this is a linkset, we don't want the physics engine mucking up our group position here. 679 // If this is a linkset, we don't want the physics engine mucking up our group position here.
667 PhysicsActor actor = PhysActor; 680 PhysicsActor actor = PhysActor;
668 if (actor != null && ParentID == 0) 681 if (ParentID == 0)
669 { 682 {
670 m_groupPosition = actor.Position; 683 if (actor != null)
684 m_groupPosition = actor.Position;
685 return m_groupPosition;
671 } 686 }
672 687
673 if (ParentGroup.IsAttachment) 688 if (ParentGroup.IsAttachment)
@@ -677,12 +692,14 @@ namespace OpenSim.Region.Framework.Scenes
677 return sp.AbsolutePosition; 692 return sp.AbsolutePosition;
678 } 693 }
679 694
695 // use root prim's group position. Physics may have updated it
696 if (ParentGroup.RootPart != this)
697 m_groupPosition = ParentGroup.RootPart.GroupPosition;
680 return m_groupPosition; 698 return m_groupPosition;
681 } 699 }
682 set 700 set
683 { 701 {
684 m_groupPosition = value; 702 m_groupPosition = value;
685
686 PhysicsActor actor = PhysActor; 703 PhysicsActor actor = PhysActor;
687 if (actor != null) 704 if (actor != null)
688 { 705 {
@@ -708,16 +725,6 @@ namespace OpenSim.Region.Framework.Scenes
708 m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message); 725 m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message);
709 } 726 }
710 } 727 }
711
712 // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
713 if (SitTargetAvatar != UUID.Zero)
714 {
715 ScenePresence avatar;
716 if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar))
717 {
718 avatar.ParentPosition = GetWorldPosition();
719 }
720 }
721 } 728 }
722 } 729 }
723 730
@@ -726,7 +733,7 @@ namespace OpenSim.Region.Framework.Scenes
726 get { return m_offsetPosition; } 733 get { return m_offsetPosition; }
727 set 734 set
728 { 735 {
729// StoreUndoState(); 736 Vector3 oldpos = m_offsetPosition;
730 m_offsetPosition = value; 737 m_offsetPosition = value;
731 738
732 if (ParentGroup != null && !ParentGroup.IsDeleted) 739 if (ParentGroup != null && !ParentGroup.IsDeleted)
@@ -741,7 +748,22 @@ namespace OpenSim.Region.Framework.Scenes
741 if (ParentGroup.Scene != null) 748 if (ParentGroup.Scene != null)
742 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 749 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
743 } 750 }
751
752 if (!m_parentGroup.m_dupeInProgress)
753 {
754 List<ScenePresence> avs = ParentGroup.GetLinkedAvatars();
755 foreach (ScenePresence av in avs)
756 {
757 if (av.ParentID == m_localId)
758 {
759 Vector3 offset = (m_offsetPosition - oldpos);
760 av.AbsolutePosition += offset;
761 av.SendAvatarDataToAllAgents();
762 }
763 }
764 }
744 } 765 }
766 TriggerScriptChangedEvent(Changed.POSITION);
745 } 767 }
746 } 768 }
747 769
@@ -890,7 +912,16 @@ namespace OpenSim.Region.Framework.Scenes
890 /// <summary></summary> 912 /// <summary></summary>
891 public Vector3 Acceleration 913 public Vector3 Acceleration
892 { 914 {
893 get { return m_acceleration; } 915 get
916 {
917 PhysicsActor actor = PhysActor;
918 if (actor != null)
919 {
920 m_acceleration = actor.Acceleration;
921 }
922 return m_acceleration;
923 }
924
894 set { m_acceleration = value; } 925 set { m_acceleration = value; }
895 } 926 }
896 927
@@ -1041,10 +1072,7 @@ namespace OpenSim.Region.Framework.Scenes
1041 { 1072 {
1042 get 1073 get
1043 { 1074 {
1044 if (ParentGroup.IsAttachment) 1075 return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
1045 return GroupPosition;
1046
1047 return m_offsetPosition + m_groupPosition;
1048 } 1076 }
1049 } 1077 }
1050 1078
@@ -1214,6 +1242,13 @@ namespace OpenSim.Region.Framework.Scenes
1214 _flags = value; 1242 _flags = value;
1215 } 1243 }
1216 } 1244 }
1245
1246 [XmlIgnore]
1247 public bool IsOccupied // KF If an av is sittingon this prim
1248 {
1249 get { return m_occupied; }
1250 set { m_occupied = value; }
1251 }
1217 1252
1218 /// <summary> 1253 /// <summary>
1219 /// ID of the avatar that is sat on us. If there is no such avatar then is UUID.Zero 1254 /// ID of the avatar that is sat on us. If there is no such avatar then is UUID.Zero
@@ -1273,6 +1308,19 @@ namespace OpenSim.Region.Framework.Scenes
1273 set { m_collisionSoundVolume = value; } 1308 set { m_collisionSoundVolume = value; }
1274 } 1309 }
1275 1310
1311 public float Buoyancy
1312 {
1313 get { return m_buoyancy; }
1314 set
1315 {
1316 m_buoyancy = value;
1317 if (PhysActor != null)
1318 {
1319 PhysActor.Buoyancy = value;
1320 }
1321 }
1322 }
1323
1276 #endregion Public Properties with only Get 1324 #endregion Public Properties with only Get
1277 1325
1278 private uint ApplyMask(uint val, bool set, uint mask) 1326 private uint ApplyMask(uint val, bool set, uint mask)
@@ -1597,6 +1645,9 @@ namespace OpenSim.Region.Framework.Scenes
1597 1645
1598 // Move afterwards ResetIDs as it clears the localID 1646 // Move afterwards ResetIDs as it clears the localID
1599 dupe.LocalId = localID; 1647 dupe.LocalId = localID;
1648 if(dupe.PhysActor != null)
1649 dupe.PhysActor.LocalID = localID;
1650
1600 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. 1651 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
1601 dupe.LastOwnerID = OwnerID; 1652 dupe.LastOwnerID = OwnerID;
1602 1653
@@ -2602,17 +2653,18 @@ namespace OpenSim.Region.Framework.Scenes
2602 //Trys to fetch sound id from prim's inventory. 2653 //Trys to fetch sound id from prim's inventory.
2603 //Prim's inventory doesn't support non script items yet 2654 //Prim's inventory doesn't support non script items yet
2604 2655
2605 lock (TaskInventory) 2656 TaskInventory.LockItemsForRead(true);
2657
2658 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2606 { 2659 {
2607 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 2660 if (item.Value.Name == sound)
2608 { 2661 {
2609 if (item.Value.Name == sound) 2662 soundID = item.Value.ItemID;
2610 { 2663 break;
2611 soundID = item.Value.ItemID;
2612 break;
2613 }
2614 } 2664 }
2615 } 2665 }
2666
2667 TaskInventory.LockItemsForRead(false);
2616 } 2668 }
2617 2669
2618 ParentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) 2670 ParentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
@@ -2925,8 +2977,8 @@ namespace OpenSim.Region.Framework.Scenes
2925 { 2977 {
2926 const float ROTATION_TOLERANCE = 0.01f; 2978 const float ROTATION_TOLERANCE = 0.01f;
2927 const float VELOCITY_TOLERANCE = 0.001f; 2979 const float VELOCITY_TOLERANCE = 0.001f;
2928 const float POSITION_TOLERANCE = 0.05f; 2980 const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
2929 const int TIME_MS_TOLERANCE = 3000; 2981 const int TIME_MS_TOLERANCE = 200; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
2930 2982
2931 switch (UpdateFlag) 2983 switch (UpdateFlag)
2932 { 2984 {
@@ -2988,17 +3040,16 @@ namespace OpenSim.Region.Framework.Scenes
2988 if (!UUID.TryParse(sound, out soundID)) 3040 if (!UUID.TryParse(sound, out soundID))
2989 { 3041 {
2990 // search sound file from inventory 3042 // search sound file from inventory
2991 lock (TaskInventory) 3043 TaskInventory.LockItemsForRead(true);
3044 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2992 { 3045 {
2993 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 3046 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound)
2994 { 3047 {
2995 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound) 3048 soundID = item.Value.ItemID;
2996 { 3049 break;
2997 soundID = item.Value.ItemID;
2998 break;
2999 }
3000 } 3050 }
3001 } 3051 }
3052 TaskInventory.LockItemsForRead(false);
3002 } 3053 }
3003 3054
3004 if (soundID == UUID.Zero) 3055 if (soundID == UUID.Zero)
@@ -3465,10 +3516,10 @@ namespace OpenSim.Region.Framework.Scenes
3465 // TODO: May need to fix for group comparison 3516 // TODO: May need to fix for group comparison
3466 if (last.Compare(this)) 3517 if (last.Compare(this))
3467 { 3518 {
3468 // m_log.DebugFormat( 3519 // m_log.DebugFormat(
3469 // "[SCENE OBJECT PART]: Not storing undo for {0} {1} since current state is same as last undo state, initial stack size {2}", 3520 // "[SCENE OBJECT PART]: Not storing undo for {0} {1} since current state is same as last undo state, initial stack size {2}",
3470 // Name, LocalId, m_undo.Count); 3521 // Name, LocalId, m_undo.Count);
3471 3522
3472 return; 3523 return;
3473 } 3524 }
3474 } 3525 }
@@ -3481,29 +3532,29 @@ namespace OpenSim.Region.Framework.Scenes
3481 if (ParentGroup.GetSceneMaxUndo() > 0) 3532 if (ParentGroup.GetSceneMaxUndo() > 0)
3482 { 3533 {
3483 UndoState nUndo = new UndoState(this, forGroup); 3534 UndoState nUndo = new UndoState(this, forGroup);
3484 3535
3485 m_undo.Push(nUndo); 3536 m_undo.Push(nUndo);
3486 3537
3487 if (m_redo.Count > 0) 3538 if (m_redo.Count > 0)
3488 m_redo.Clear(); 3539 m_redo.Clear();
3489 3540
3490 // m_log.DebugFormat( 3541 // m_log.DebugFormat(
3491 // "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}", 3542 // "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}",
3492 // Name, LocalId, forGroup, m_undo.Count); 3543 // Name, LocalId, forGroup, m_undo.Count);
3493 } 3544 }
3494 } 3545 }
3495 } 3546 }
3496 } 3547 }
3497// else 3548 // else
3498// { 3549 // {
3499// m_log.DebugFormat("[SCENE OBJECT PART]: Ignoring undo store for {0} {1}", Name, LocalId); 3550 // m_log.DebugFormat("[SCENE OBJECT PART]: Ignoring undo store for {0} {1}", Name, LocalId);
3500// } 3551 // }
3501 } 3552 }
3502// else 3553 // else
3503// { 3554 // {
3504// m_log.DebugFormat( 3555 // m_log.DebugFormat(
3505// "[SCENE OBJECT PART]: Ignoring undo store for {0} {1} since already undoing", Name, LocalId); 3556 // "[SCENE OBJECT PART]: Ignoring undo store for {0} {1} since already undoing", Name, LocalId);
3506// } 3557 // }
3507 } 3558 }
3508 3559
3509 /// <summary> 3560 /// <summary>
@@ -4234,6 +4285,9 @@ namespace OpenSim.Region.Framework.Scenes
4234 bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0); 4285 bool wasPhantom = ((Flags & PrimFlags.Phantom) != 0);
4235 bool wasVD = VolumeDetectActive; 4286 bool wasVD = VolumeDetectActive;
4236 4287
4288// m_log.DebugFormat("[SOP]: Old states: phys: {0} temp: {1} phan: {2} vd: {3}", wasUsingPhysics, wasTemporary, wasPhantom, wasVD);
4289// m_log.DebugFormat("[SOP]: New states: phys: {0} temp: {1} phan: {2} vd: {3}", UsePhysics, SetTemporary, SetPhantom, SetVD);
4290
4237 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD)) 4291 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD))
4238 return; 4292 return;
4239 4293
@@ -4263,6 +4317,11 @@ namespace OpenSim.Region.Framework.Scenes
4263 SetPhantom = false; 4317 SetPhantom = false;
4264 } 4318 }
4265 } 4319 }
4320 else if (wasVD)
4321 {
4322 // Correspondingly, if VD is turned off, also turn off phantom
4323 SetPhantom = false;
4324 }
4266 4325
4267 if (UsePhysics && IsJoint()) 4326 if (UsePhysics && IsJoint())
4268 { 4327 {
@@ -4753,5 +4812,17 @@ namespace OpenSim.Region.Framework.Scenes
4753 Color color = Color; 4812 Color color = Color;
4754 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A)); 4813 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A));
4755 } 4814 }
4815
4816 public void ResetOwnerChangeFlag()
4817 {
4818 List<UUID> inv = Inventory.GetInventoryList();
4819
4820 foreach (UUID itemID in inv)
4821 {
4822 TaskInventoryItem item = Inventory.GetInventoryItem(itemID);
4823 item.OwnerChanged = false;
4824 Inventory.UpdateInventoryItem(item, false, false);
4825 }
4826 }
4756 } 4827 }
4757} 4828}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index daddb90..2335ad5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Region.Framework.Scenes
48 private string m_inventoryFileName = String.Empty; 48 private string m_inventoryFileName = String.Empty;
49 private byte[] m_inventoryFileData = new byte[0]; 49 private byte[] m_inventoryFileData = new byte[0];
50 private uint m_inventoryFileNameSerial = 0; 50 private uint m_inventoryFileNameSerial = 0;
51 private bool m_inventoryPrivileged = false;
52
53 private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
51 54
52 /// <value> 55 /// <value>
53 /// The part to which the inventory belongs. 56 /// The part to which the inventory belongs.
@@ -84,11 +87,14 @@ namespace OpenSim.Region.Framework.Scenes
84 /// </value> 87 /// </value>
85 protected internal TaskInventoryDictionary Items 88 protected internal TaskInventoryDictionary Items
86 { 89 {
87 get { return m_items; } 90 get {
91 return m_items;
92 }
88 set 93 set
89 { 94 {
90 m_items = value; 95 m_items = value;
91 m_inventorySerial++; 96 m_inventorySerial++;
97 QueryScriptStates();
92 } 98 }
93 } 99 }
94 100
@@ -123,38 +129,45 @@ namespace OpenSim.Region.Framework.Scenes
123 public void ResetInventoryIDs() 129 public void ResetInventoryIDs()
124 { 130 {
125 if (null == m_part) 131 if (null == m_part)
126 return; 132 m_items.LockItemsForWrite(true);
127 133
128 lock (m_items) 134 if (Items.Count == 0)
129 { 135 {
130 if (0 == m_items.Count) 136 m_items.LockItemsForWrite(false);
131 return; 137 return;
138 }
132 139
133 IList<TaskInventoryItem> items = GetInventoryItems(); 140 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
134 m_items.Clear(); 141 Items.Clear();
135 142
136 foreach (TaskInventoryItem item in items) 143 foreach (TaskInventoryItem item in items)
137 { 144 {
138 item.ResetIDs(m_part.UUID); 145 item.ResetIDs(m_part.UUID);
139 m_items.Add(item.ItemID, item); 146 Items.Add(item.ItemID, item);
140 }
141 } 147 }
148 m_items.LockItemsForWrite(false);
142 } 149 }
143 150
144 public void ResetObjectID() 151 public void ResetObjectID()
145 { 152 {
146 lock (Items) 153 m_items.LockItemsForWrite(true);
154
155 if (Items.Count == 0)
147 { 156 {
148 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 157 m_items.LockItemsForWrite(false);
149 Items.Clear(); 158 return;
150
151 foreach (TaskInventoryItem item in items)
152 {
153 item.ParentPartID = m_part.UUID;
154 item.ParentID = m_part.UUID;
155 Items.Add(item.ItemID, item);
156 }
157 } 159 }
160
161 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
162 Items.Clear();
163
164 foreach (TaskInventoryItem item in items)
165 {
166 item.ParentPartID = m_part.UUID;
167 item.ParentID = m_part.UUID;
168 Items.Add(item.ItemID, item);
169 }
170 m_items.LockItemsForWrite(false);
158 } 171 }
159 172
160 /// <summary> 173 /// <summary>
@@ -163,12 +176,11 @@ namespace OpenSim.Region.Framework.Scenes
163 /// <param name="ownerId"></param> 176 /// <param name="ownerId"></param>
164 public void ChangeInventoryOwner(UUID ownerId) 177 public void ChangeInventoryOwner(UUID ownerId)
165 { 178 {
166 lock (Items) 179 m_items.LockItemsForWrite(true);
180 if (0 == Items.Count)
167 { 181 {
168 if (0 == Items.Count) 182 m_items.LockItemsForWrite(false);
169 { 183 return;
170 return;
171 }
172 } 184 }
173 185
174 HasInventoryChanged = true; 186 HasInventoryChanged = true;
@@ -184,6 +196,7 @@ namespace OpenSim.Region.Framework.Scenes
184 item.PermsGranter = UUID.Zero; 196 item.PermsGranter = UUID.Zero;
185 item.OwnerChanged = true; 197 item.OwnerChanged = true;
186 } 198 }
199 m_items.LockItemsForWrite(false);
187 } 200 }
188 201
189 /// <summary> 202 /// <summary>
@@ -192,12 +205,11 @@ namespace OpenSim.Region.Framework.Scenes
192 /// <param name="groupID"></param> 205 /// <param name="groupID"></param>
193 public void ChangeInventoryGroup(UUID groupID) 206 public void ChangeInventoryGroup(UUID groupID)
194 { 207 {
195 lock (Items) 208 m_items.LockItemsForWrite(true);
209 if (0 == Items.Count)
196 { 210 {
197 if (0 == Items.Count) 211 m_items.LockItemsForWrite(false);
198 { 212 return;
199 return;
200 }
201 } 213 }
202 214
203 // Don't let this set the HasGroupChanged flag for attachments 215 // Don't let this set the HasGroupChanged flag for attachments
@@ -209,12 +221,45 @@ namespace OpenSim.Region.Framework.Scenes
209 m_part.ParentGroup.HasGroupChanged = true; 221 m_part.ParentGroup.HasGroupChanged = true;
210 } 222 }
211 223
212 List<TaskInventoryItem> items = GetInventoryItems(); 224 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
213 foreach (TaskInventoryItem item in items) 225 foreach (TaskInventoryItem item in items)
214 { 226 {
215 if (groupID != item.GroupID) 227 if (groupID != item.GroupID)
228 {
216 item.GroupID = groupID; 229 item.GroupID = groupID;
230 }
231 }
232 m_items.LockItemsForWrite(false);
233 }
234
235 private void QueryScriptStates()
236 {
237 if (m_part == null || m_part.ParentGroup == null)
238 return;
239
240 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
241 if (engines == null) // No engine at all
242 return;
243
244 Items.LockItemsForRead(true);
245 foreach (TaskInventoryItem item in Items.Values)
246 {
247 if (item.InvType == (int)InventoryType.LSL)
248 {
249 foreach (IScriptModule e in engines)
250 {
251 bool running;
252
253 if (e.HasScript(item.ItemID, out running))
254 {
255 item.ScriptRunning = running;
256 break;
257 }
258 }
259 }
217 } 260 }
261
262 Items.LockItemsForRead(false);
218 } 263 }
219 264
220 /// <summary> 265 /// <summary>
@@ -222,9 +267,14 @@ namespace OpenSim.Region.Framework.Scenes
222 /// </summary> 267 /// </summary>
223 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) 268 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
224 { 269 {
225 List<TaskInventoryItem> scripts = GetInventoryScripts(); 270 Items.LockItemsForRead(true);
226 foreach (TaskInventoryItem item in scripts) 271 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
227 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 272 Items.LockItemsForRead(false);
273 foreach (TaskInventoryItem item in items)
274 {
275 if ((int)InventoryType.LSL == item.InvType)
276 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
277 }
228 } 278 }
229 279
230 public ArrayList GetScriptErrors(UUID itemID) 280 public ArrayList GetScriptErrors(UUID itemID)
@@ -255,9 +305,18 @@ namespace OpenSim.Region.Framework.Scenes
255 /// </param> 305 /// </param>
256 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 306 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
257 { 307 {
258 List<TaskInventoryItem> scripts = GetInventoryScripts(); 308 Items.LockItemsForRead(true);
259 foreach (TaskInventoryItem item in scripts) 309 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
260 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted); 310 Items.LockItemsForRead(false);
311
312 foreach (TaskInventoryItem item in items)
313 {
314 if ((int)InventoryType.LSL == item.InvType)
315 {
316 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
317 m_part.RemoveScriptEvents(item.ItemID);
318 }
319 }
261 } 320 }
262 321
263 /// <summary> 322 /// <summary>
@@ -273,7 +332,10 @@ namespace OpenSim.Region.Framework.Scenes
273 // item.Name, item.ItemID, Name, UUID); 332 // item.Name, item.ItemID, Name, UUID);
274 333
275 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID)) 334 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
335 {
336 StoreScriptError(item.ItemID, "no permission");
276 return; 337 return;
338 }
277 339
278 m_part.AddFlag(PrimFlags.Scripted); 340 m_part.AddFlag(PrimFlags.Scripted);
279 341
@@ -282,14 +344,13 @@ namespace OpenSim.Region.Framework.Scenes
282 if (stateSource == 2 && // Prim crossing 344 if (stateSource == 2 && // Prim crossing
283 m_part.ParentGroup.Scene.m_trustBinaries) 345 m_part.ParentGroup.Scene.m_trustBinaries)
284 { 346 {
285 lock (m_items) 347 m_items.LockItemsForWrite(true);
286 { 348 m_items[item.ItemID].PermsMask = 0;
287 m_items[item.ItemID].PermsMask = 0; 349 m_items[item.ItemID].PermsGranter = UUID.Zero;
288 m_items[item.ItemID].PermsGranter = UUID.Zero; 350 m_items.LockItemsForWrite(false);
289 }
290
291 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 351 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
292 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource); 352 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource);
353 StoreScriptErrors(item.ItemID, null);
293 m_part.ParentGroup.AddActiveScriptCount(1); 354 m_part.ParentGroup.AddActiveScriptCount(1);
294 m_part.ScheduleFullUpdate(); 355 m_part.ScheduleFullUpdate();
295 return; 356 return;
@@ -298,6 +359,8 @@ namespace OpenSim.Region.Framework.Scenes
298 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); 359 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
299 if (null == asset) 360 if (null == asset)
300 { 361 {
362 string msg = String.Format("asset ID {0} could not be found", item.AssetID);
363 StoreScriptError(item.ItemID, msg);
301 m_log.ErrorFormat( 364 m_log.ErrorFormat(
302 "[PRIM INVENTORY]: " + 365 "[PRIM INVENTORY]: " +
303 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", 366 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
@@ -309,15 +372,20 @@ namespace OpenSim.Region.Framework.Scenes
309 if (m_part.ParentGroup.m_savedScriptState != null) 372 if (m_part.ParentGroup.m_savedScriptState != null)
310 RestoreSavedScriptState(item.OldItemID, item.ItemID); 373 RestoreSavedScriptState(item.OldItemID, item.ItemID);
311 374
312 lock (m_items) 375 m_items.LockItemsForWrite(true);
313 { 376
314 m_items[item.ItemID].PermsMask = 0; 377 m_items[item.ItemID].PermsMask = 0;
315 m_items[item.ItemID].PermsGranter = UUID.Zero; 378 m_items[item.ItemID].PermsGranter = UUID.Zero;
316 } 379
380 m_items.LockItemsForWrite(false);
317 381
318 string script = Utils.BytesToString(asset.Data); 382 string script = Utils.BytesToString(asset.Data);
319 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 383 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
320 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource); 384 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
385 StoreScriptErrors(item.ItemID, null);
386 if (!item.ScriptRunning)
387 m_part.ParentGroup.Scene.EventManager.TriggerStopScript(
388 m_part.LocalId, item.ItemID);
321 m_part.ParentGroup.AddActiveScriptCount(1); 389 m_part.ParentGroup.AddActiveScriptCount(1);
322 m_part.ScheduleFullUpdate(); 390 m_part.ScheduleFullUpdate();
323 } 391 }
@@ -383,21 +451,145 @@ namespace OpenSim.Region.Framework.Scenes
383 451
384 /// <summary> 452 /// <summary>
385 /// Start a script which is in this prim's inventory. 453 /// Start a script which is in this prim's inventory.
454 /// Some processing may occur in the background, but this routine returns asap.
386 /// </summary> 455 /// </summary>
387 /// <param name="itemId"> 456 /// <param name="itemId">
388 /// A <see cref="UUID"/> 457 /// A <see cref="UUID"/>
389 /// </param> 458 /// </param>
390 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource) 459 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
391 { 460 {
392 TaskInventoryItem item = GetInventoryItem(itemId); 461 lock (m_scriptErrors)
393 if (item != null) 462 {
394 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 463 // Indicate to CreateScriptInstanceInternal() we don't want it to wait for completion
464 m_scriptErrors.Remove(itemId);
465 }
466 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
467 }
468
469 private void CreateScriptInstanceInternal(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
470 {
471 m_items.LockItemsForRead(true);
472 if (m_items.ContainsKey(itemId))
473 {
474 if (m_items.ContainsKey(itemId))
475 {
476 m_items.LockItemsForRead(false);
477 CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
478 }
479 else
480 {
481 m_items.LockItemsForRead(false);
482 string msg = String.Format("couldn't be found for prim {0}, {1} at {2} in {3}", m_part.Name, m_part.UUID,
483 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
484 StoreScriptError(itemId, msg);
485 m_log.ErrorFormat(
486 "[PRIM INVENTORY]: " +
487 "Couldn't start script with ID {0} since it {1}", itemId, msg);
488 }
489 }
395 else 490 else
491 {
492 m_items.LockItemsForRead(false);
493 string msg = String.Format("couldn't be found for prim {0}, {1}", m_part.Name, m_part.UUID);
494 StoreScriptError(itemId, msg);
396 m_log.ErrorFormat( 495 m_log.ErrorFormat(
397 "[PRIM INVENTORY]: " + 496 "[PRIM INVENTORY]: " +
398 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}", 497 "Couldn't start script with ID {0} since it {1}", itemId, msg);
399 itemId, m_part.Name, m_part.UUID, 498 }
400 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 499
500 }
501
502 /// <summary>
503 /// Start a script which is in this prim's inventory and return any compilation error messages.
504 /// </summary>
505 /// <param name="itemId">
506 /// A <see cref="UUID"/>
507 /// </param>
508 public ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
509 {
510 ArrayList errors;
511
512 // Indicate to CreateScriptInstanceInternal() we want it to
513 // post any compilation/loading error messages
514 lock (m_scriptErrors)
515 {
516 m_scriptErrors[itemId] = null;
517 }
518
519 // Perform compilation/loading
520 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
521
522 // Wait for and retrieve any errors
523 lock (m_scriptErrors)
524 {
525 while ((errors = m_scriptErrors[itemId]) == null)
526 {
527 if (!System.Threading.Monitor.Wait(m_scriptErrors, 15000))
528 {
529 m_log.ErrorFormat(
530 "[PRIM INVENTORY]: " +
531 "timedout waiting for script {0} errors", itemId);
532 errors = m_scriptErrors[itemId];
533 if (errors == null)
534 {
535 errors = new ArrayList(1);
536 errors.Add("timedout waiting for errors");
537 }
538 break;
539 }
540 }
541 m_scriptErrors.Remove(itemId);
542 }
543 return errors;
544 }
545
546 // Signal to CreateScriptInstanceEr() that compilation/loading is complete
547 private void StoreScriptErrors(UUID itemId, ArrayList errors)
548 {
549 lock (m_scriptErrors)
550 {
551 // If compilation/loading initiated via CreateScriptInstance(),
552 // it does not want the errors, so just get out
553 if (!m_scriptErrors.ContainsKey(itemId))
554 {
555 return;
556 }
557
558 // Initiated via CreateScriptInstanceEr(), if we know what the
559 // errors are, save them and wake CreateScriptInstanceEr().
560 if (errors != null)
561 {
562 m_scriptErrors[itemId] = errors;
563 System.Threading.Monitor.PulseAll(m_scriptErrors);
564 return;
565 }
566 }
567
568 // Initiated via CreateScriptInstanceEr() but we don't know what
569 // the errors are yet, so retrieve them from the script engine.
570 // This may involve some waiting internal to GetScriptErrors().
571 errors = GetScriptErrors(itemId);
572
573 // Get a default non-null value to indicate success.
574 if (errors == null)
575 {
576 errors = new ArrayList();
577 }
578
579 // Post to CreateScriptInstanceEr() and wake it up
580 lock (m_scriptErrors)
581 {
582 m_scriptErrors[itemId] = errors;
583 System.Threading.Monitor.PulseAll(m_scriptErrors);
584 }
585 }
586
587 // Like StoreScriptErrors(), but just posts a single string message
588 private void StoreScriptError(UUID itemId, string message)
589 {
590 ArrayList errors = new ArrayList(1);
591 errors.Add(message);
592 StoreScriptErrors(itemId, errors);
401 } 593 }
402 594
403 /// <summary> 595 /// <summary>
@@ -410,15 +602,7 @@ namespace OpenSim.Region.Framework.Scenes
410 /// </param> 602 /// </param>
411 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted) 603 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted)
412 { 604 {
413 bool scriptPresent = false; 605 if (m_items.ContainsKey(itemId))
414
415 lock (m_items)
416 {
417 if (m_items.ContainsKey(itemId))
418 scriptPresent = true;
419 }
420
421 if (scriptPresent)
422 { 606 {
423 if (!sceneObjectBeingDeleted) 607 if (!sceneObjectBeingDeleted)
424 m_part.RemoveScriptEvents(itemId); 608 m_part.RemoveScriptEvents(itemId);
@@ -443,14 +627,16 @@ namespace OpenSim.Region.Framework.Scenes
443 /// <returns></returns> 627 /// <returns></returns>
444 private bool InventoryContainsName(string name) 628 private bool InventoryContainsName(string name)
445 { 629 {
446 lock (m_items) 630 m_items.LockItemsForRead(true);
631 foreach (TaskInventoryItem item in m_items.Values)
447 { 632 {
448 foreach (TaskInventoryItem item in m_items.Values) 633 if (item.Name == name)
449 { 634 {
450 if (item.Name == name) 635 m_items.LockItemsForRead(false);
451 return true; 636 return true;
452 } 637 }
453 } 638 }
639 m_items.LockItemsForRead(false);
454 return false; 640 return false;
455 } 641 }
456 642
@@ -492,8 +678,9 @@ namespace OpenSim.Region.Framework.Scenes
492 /// <param name="item"></param> 678 /// <param name="item"></param>
493 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) 679 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
494 { 680 {
495 List<TaskInventoryItem> il = GetInventoryItems(); 681 m_items.LockItemsForRead(true);
496 682 List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values);
683 m_items.LockItemsForRead(false);
497 foreach (TaskInventoryItem i in il) 684 foreach (TaskInventoryItem i in il)
498 { 685 {
499 if (i.Name == item.Name) 686 if (i.Name == item.Name)
@@ -531,14 +718,14 @@ namespace OpenSim.Region.Framework.Scenes
531 item.Name = name; 718 item.Name = name;
532 item.GroupID = m_part.GroupID; 719 item.GroupID = m_part.GroupID;
533 720
534 lock (m_items) 721 m_items.LockItemsForWrite(true);
535 m_items.Add(item.ItemID, item); 722 m_items.Add(item.ItemID, item);
536 723 m_items.LockItemsForWrite(false);
537 if (allowedDrop) 724 if (allowedDrop)
538 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); 725 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
539 else 726 else
540 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 727 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
541 728
542 m_inventorySerial++; 729 m_inventorySerial++;
543 //m_inventorySerial += 2; 730 //m_inventorySerial += 2;
544 HasInventoryChanged = true; 731 HasInventoryChanged = true;
@@ -554,15 +741,15 @@ namespace OpenSim.Region.Framework.Scenes
554 /// <param name="items"></param> 741 /// <param name="items"></param>
555 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items) 742 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
556 { 743 {
557 lock (m_items) 744 m_items.LockItemsForWrite(true);
745 foreach (TaskInventoryItem item in items)
558 { 746 {
559 foreach (TaskInventoryItem item in items) 747 m_items.Add(item.ItemID, item);
560 { 748// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
561 m_items.Add(item.ItemID, item);
562// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
563 }
564 m_inventorySerial++;
565 } 749 }
750 m_items.LockItemsForWrite(false);
751
752 m_inventorySerial++;
566 } 753 }
567 754
568 /// <summary> 755 /// <summary>
@@ -573,10 +760,9 @@ namespace OpenSim.Region.Framework.Scenes
573 public TaskInventoryItem GetInventoryItem(UUID itemId) 760 public TaskInventoryItem GetInventoryItem(UUID itemId)
574 { 761 {
575 TaskInventoryItem item; 762 TaskInventoryItem item;
576 763 m_items.LockItemsForRead(true);
577 lock (m_items) 764 m_items.TryGetValue(itemId, out item);
578 m_items.TryGetValue(itemId, out item); 765 m_items.LockItemsForRead(false);
579
580 return item; 766 return item;
581 } 767 }
582 768
@@ -592,15 +778,16 @@ namespace OpenSim.Region.Framework.Scenes
592 { 778 {
593 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(); 779 IList<TaskInventoryItem> items = new List<TaskInventoryItem>();
594 780
595 lock (m_items) 781 m_items.LockItemsForRead(true);
782
783 foreach (TaskInventoryItem item in m_items.Values)
596 { 784 {
597 foreach (TaskInventoryItem item in m_items.Values) 785 if (item.Name == name)
598 { 786 items.Add(item);
599 if (item.Name == name)
600 items.Add(item);
601 }
602 } 787 }
603 788
789 m_items.LockItemsForRead(false);
790
604 return items; 791 return items;
605 } 792 }
606 793
@@ -619,6 +806,9 @@ namespace OpenSim.Region.Framework.Scenes
619 string xmlData = Utils.BytesToString(rezAsset.Data); 806 string xmlData = Utils.BytesToString(rezAsset.Data);
620 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); 807 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
621 808
809 group.RootPart.AttachPoint = group.RootPart.Shape.State;
810 group.RootPart.AttachOffset = group.AbsolutePosition;
811
622 group.ResetIDs(); 812 group.ResetIDs();
623 813
624 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 814 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
@@ -693,8 +883,9 @@ namespace OpenSim.Region.Framework.Scenes
693 883
694 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged) 884 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged)
695 { 885 {
696 TaskInventoryItem it = GetInventoryItem(item.ItemID); 886 m_items.LockItemsForWrite(true);
697 if (it != null) 887
888 if (m_items.ContainsKey(item.ItemID))
698 { 889 {
699// m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name); 890// m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name);
700 891
@@ -707,14 +898,10 @@ namespace OpenSim.Region.Framework.Scenes
707 item.GroupID = m_part.GroupID; 898 item.GroupID = m_part.GroupID;
708 899
709 if (item.AssetID == UUID.Zero) 900 if (item.AssetID == UUID.Zero)
710 item.AssetID = it.AssetID; 901 item.AssetID = m_items[item.ItemID].AssetID;
711 902
712 lock (m_items) 903 m_items[item.ItemID] = item;
713 { 904 m_inventorySerial++;
714 m_items[item.ItemID] = item;
715 m_inventorySerial++;
716 }
717
718 if (fireScriptEvents) 905 if (fireScriptEvents)
719 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 906 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
720 907
@@ -723,7 +910,7 @@ namespace OpenSim.Region.Framework.Scenes
723 HasInventoryChanged = true; 910 HasInventoryChanged = true;
724 m_part.ParentGroup.HasGroupChanged = true; 911 m_part.ParentGroup.HasGroupChanged = true;
725 } 912 }
726 913 m_items.LockItemsForWrite(false);
727 return true; 914 return true;
728 } 915 }
729 else 916 else
@@ -734,8 +921,9 @@ namespace OpenSim.Region.Framework.Scenes
734 item.ItemID, m_part.Name, m_part.UUID, 921 item.ItemID, m_part.Name, m_part.UUID,
735 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 922 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
736 } 923 }
737 return false; 924 m_items.LockItemsForWrite(false);
738 925
926 return false;
739 } 927 }
740 928
741 /// <summary> 929 /// <summary>
@@ -746,43 +934,59 @@ namespace OpenSim.Region.Framework.Scenes
746 /// in this prim's inventory.</returns> 934 /// in this prim's inventory.</returns>
747 public int RemoveInventoryItem(UUID itemID) 935 public int RemoveInventoryItem(UUID itemID)
748 { 936 {
749 TaskInventoryItem item = GetInventoryItem(itemID); 937 m_items.LockItemsForRead(true);
750 if (item != null) 938
939 if (m_items.ContainsKey(itemID))
751 { 940 {
752 int type = m_items[itemID].InvType; 941 int type = m_items[itemID].InvType;
942 m_items.LockItemsForRead(false);
753 if (type == 10) // Script 943 if (type == 10) // Script
754 { 944 {
755 m_part.RemoveScriptEvents(itemID);
756 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); 945 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
757 } 946 }
947 m_items.LockItemsForWrite(true);
758 m_items.Remove(itemID); 948 m_items.Remove(itemID);
949 m_items.LockItemsForWrite(false);
759 m_inventorySerial++; 950 m_inventorySerial++;
760 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 951 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
761 952
762 HasInventoryChanged = true; 953 HasInventoryChanged = true;
763 m_part.ParentGroup.HasGroupChanged = true; 954 m_part.ParentGroup.HasGroupChanged = true;
764 955
765 if (!ContainsScripts()) 956 int scriptcount = 0;
957 m_items.LockItemsForRead(true);
958 foreach (TaskInventoryItem item in m_items.Values)
959 {
960 if (item.Type == 10)
961 {
962 scriptcount++;
963 }
964 }
965 m_items.LockItemsForRead(false);
966
967
968 if (scriptcount <= 0)
969 {
766 m_part.RemFlag(PrimFlags.Scripted); 970 m_part.RemFlag(PrimFlags.Scripted);
971 }
767 972
768 m_part.ScheduleFullUpdate(); 973 m_part.ScheduleFullUpdate();
769 974
770 return type; 975 return type;
771
772 } 976 }
773 else 977 else
774 { 978 {
979 m_items.LockItemsForRead(false);
775 m_log.ErrorFormat( 980 m_log.ErrorFormat(
776 "[PRIM INVENTORY]: " + 981 "[PRIM INVENTORY]: " +
777 "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory", 982 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
778 itemID, m_part.Name, m_part.UUID, 983 itemID, m_part.Name, m_part.UUID);
779 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
780 } 984 }
781 985
782 return -1; 986 return -1;
783 } 987 }
784 988
785 private bool CreateInventoryFile() 989 private bool CreateInventoryFileName()
786 { 990 {
787// m_log.DebugFormat( 991// m_log.DebugFormat(
788// "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}", 992// "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}",
@@ -791,116 +995,125 @@ namespace OpenSim.Region.Framework.Scenes
791 if (m_inventoryFileName == String.Empty || 995 if (m_inventoryFileName == String.Empty ||
792 m_inventoryFileNameSerial < m_inventorySerial) 996 m_inventoryFileNameSerial < m_inventorySerial)
793 { 997 {
794 // Something changed, we need to create a new file
795 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp"; 998 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
796 m_inventoryFileNameSerial = m_inventorySerial; 999 m_inventoryFileNameSerial = m_inventorySerial;
797 1000
798 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero); 1001 return true;
1002 }
1003
1004 return false;
1005 }
1006
1007 /// <summary>
1008 /// Serialize all the metadata for the items in this prim's inventory ready for sending to the client
1009 /// </summary>
1010 /// <param name="xferManager"></param>
1011 public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
1012 {
1013 bool changed = CreateInventoryFileName();
1014
1015 bool includeAssets = false;
1016 if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
1017 includeAssets = true;
1018
1019 if (m_inventoryPrivileged != includeAssets)
1020 changed = true;
1021
1022 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
1023
1024 Items.LockItemsForRead(true);
1025
1026 if (m_inventorySerial == 0) // No inventory
1027 {
1028 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
1029 Items.LockItemsForRead(false);
1030 return;
1031 }
799 1032
800 lock (m_items) 1033 if (m_items.Count == 0) // No inventory
1034 {
1035 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
1036 Items.LockItemsForRead(false);
1037 return;
1038 }
1039
1040 if (!changed)
1041 {
1042 if (m_inventoryFileData.Length > 2)
801 { 1043 {
802 foreach (TaskInventoryItem item in m_items.Values) 1044 xferManager.AddNewFile(m_inventoryFileName,
803 { 1045 m_inventoryFileData);
804// m_log.DebugFormat( 1046 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
805// "[PRIM INVENTORY]: Adding item {0} {1} for serial {2} on prim {3} {4} {5}", 1047 Util.StringToBytes256(m_inventoryFileName));
806// item.Name, item.ItemID, m_inventorySerial, m_part.Name, m_part.UUID, m_part.LocalId);
807 1048
808 UUID ownerID = item.OwnerID; 1049 Items.LockItemsForRead(false);
809 uint everyoneMask = 0; 1050 return;
810 uint baseMask = item.BasePermissions; 1051 }
811 uint ownerMask = item.CurrentPermissions; 1052 }
812 uint groupMask = item.GroupPermissions;
813 1053
814 invString.AddItemStart(); 1054 m_inventoryPrivileged = includeAssets;
815 invString.AddNameValueLine("item_id", item.ItemID.ToString());
816 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
817 1055
818 invString.AddPermissionsStart(); 1056 foreach (TaskInventoryItem item in m_items.Values)
1057 {
1058 UUID ownerID = item.OwnerID;
1059 uint everyoneMask = 0;
1060 uint baseMask = item.BasePermissions;
1061 uint ownerMask = item.CurrentPermissions;
1062 uint groupMask = item.GroupPermissions;
819 1063
820 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask)); 1064 invString.AddItemStart();
821 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask)); 1065 invString.AddNameValueLine("item_id", item.ItemID.ToString());
822 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask)); 1066 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
823 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
824 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
825 1067
826 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 1068 invString.AddPermissionsStart();
827 invString.AddNameValueLine("owner_id", ownerID.ToString());
828 1069
829 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); 1070 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
1071 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
1072 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
1073 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
1074 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
830 1075
831 invString.AddNameValueLine("group_id", item.GroupID.ToString()); 1076 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
832 invString.AddSectionEnd(); 1077 invString.AddNameValueLine("owner_id", ownerID.ToString());
833 1078
834 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 1079 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
835 invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
836 invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
837 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
838 1080
839 invString.AddSaleStart(); 1081 invString.AddNameValueLine("group_id", item.GroupID.ToString());
840 invString.AddNameValueLine("sale_type", "not"); 1082 invString.AddSectionEnd();
841 invString.AddNameValueLine("sale_price", "0");
842 invString.AddSectionEnd();
843 1083
844 invString.AddNameValueLine("name", item.Name + "|"); 1084 if (includeAssets)
845 invString.AddNameValueLine("desc", item.Description + "|"); 1085 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
1086 else
1087 invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
1088 invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
1089 invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
1090 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
846 1091
847 invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); 1092 invString.AddSaleStart();
848 invString.AddSectionEnd(); 1093 invString.AddNameValueLine("sale_type", "not");
849 } 1094 invString.AddNameValueLine("sale_price", "0");
850 } 1095 invString.AddSectionEnd();
851 1096
852 m_inventoryFileData = Utils.StringToBytes(invString.BuildString); 1097 invString.AddNameValueLine("name", item.Name + "|");
1098 invString.AddNameValueLine("desc", item.Description + "|");
853 1099
854 return true; 1100 invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
1101 invString.AddSectionEnd();
855 } 1102 }
856 1103
857 // No need to recreate, the existing file is fine 1104 Items.LockItemsForRead(false);
858 return false;
859 }
860 1105
861 /// <summary> 1106 m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
862 /// Serialize all the metadata for the items in this prim's inventory ready for sending to the client
863 /// </summary>
864 /// <param name="xferManager"></param>
865 public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
866 {
867 lock (m_items)
868 {
869 // Don't send a inventory xfer name if there are no items. Doing so causes viewer 3 to crash when rezzing
870 // a new script if any previous deletion has left the prim inventory empty.
871 if (m_items.Count == 0) // No inventory
872 {
873// m_log.DebugFormat(
874// "[PRIM INVENTORY]: Not sending inventory data for part {0} {1} {2} for {3} since no items",
875// m_part.Name, m_part.LocalId, m_part.UUID, client.Name);
876 1107
877 client.SendTaskInventory(m_part.UUID, 0, new byte[0]); 1108 if (m_inventoryFileData.Length > 2)
878 return; 1109 {
879 } 1110 xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
880 1111 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
881 CreateInventoryFile(); 1112 Util.StringToBytes256(m_inventoryFileName));
882 1113 return;
883 // In principle, we should only do the rest if the inventory changed;
884 // by sending m_inventorySerial to the client, it ought to know
885 // that nothing changed and that it doesn't need to request the file.
886 // Unfortunately, it doesn't look like the client optimizes this;
887 // the client seems to always come back and request the Xfer,
888 // no matter what value m_inventorySerial has.
889 // FIXME: Could probably be > 0 here rather than > 2
890 if (m_inventoryFileData.Length > 2)
891 {
892 // Add the file for Xfer
893 // m_log.DebugFormat(
894 // "[PRIM INVENTORY]: Adding inventory file {0} (length {1}) for transfer on {2} {3} {4}",
895 // m_inventoryFileName, m_inventoryFileData.Length, m_part.Name, m_part.UUID, m_part.LocalId);
896
897 xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
898 }
899
900 // Tell the client we're ready to Xfer the file
901 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
902 Util.StringToBytes256(m_inventoryFileName));
903 } 1114 }
1115
1116 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
904 } 1117 }
905 1118
906 /// <summary> 1119 /// <summary>
@@ -909,13 +1122,19 @@ namespace OpenSim.Region.Framework.Scenes
909 /// <param name="datastore"></param> 1122 /// <param name="datastore"></param>
910 public void ProcessInventoryBackup(ISimulationDataService datastore) 1123 public void ProcessInventoryBackup(ISimulationDataService datastore)
911 { 1124 {
912 if (HasInventoryChanged) 1125// Removed this because linking will cause an immediate delete of the new
913 { 1126// child prim from the database and the subsequent storing of the prim sees
914 HasInventoryChanged = false; 1127// the inventory of it as unchanged and doesn't store it at all. The overhead
915 List<TaskInventoryItem> items = GetInventoryItems(); 1128// of storing prim inventory needlessly is much less than the aggravation
916 datastore.StorePrimInventory(m_part.UUID, items); 1129// of prim inventory loss.
1130// if (HasInventoryChanged)
1131// {
1132 Items.LockItemsForRead(true);
1133 datastore.StorePrimInventory(m_part.UUID, Items.Values);
1134 Items.LockItemsForRead(false);
917 1135
918 } 1136 HasInventoryChanged = false;
1137// }
919 } 1138 }
920 1139
921 public class InventoryStringBuilder 1140 public class InventoryStringBuilder
@@ -981,82 +1200,63 @@ namespace OpenSim.Region.Framework.Scenes
981 { 1200 {
982 uint mask=0x7fffffff; 1201 uint mask=0x7fffffff;
983 1202
984 lock (m_items) 1203 foreach (TaskInventoryItem item in m_items.Values)
985 { 1204 {
986 foreach (TaskInventoryItem item in m_items.Values) 1205 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
1206 mask &= ~((uint)PermissionMask.Copy >> 13);
1207 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
1208 mask &= ~((uint)PermissionMask.Transfer >> 13);
1209 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
1210 mask &= ~((uint)PermissionMask.Modify >> 13);
1211
1212 if (item.InvType == (int)InventoryType.Object)
987 { 1213 {
988 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0) 1214 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
989 mask &= ~((uint)PermissionMask.Copy >> 13); 1215 mask &= ~((uint)PermissionMask.Copy >> 13);
990 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0) 1216 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
991 mask &= ~((uint)PermissionMask.Transfer >> 13); 1217 mask &= ~((uint)PermissionMask.Transfer >> 13);
992 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0) 1218 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
993 mask &= ~((uint)PermissionMask.Modify >> 13); 1219 mask &= ~((uint)PermissionMask.Modify >> 13);
994
995 if (item.InvType != (int)InventoryType.Object)
996 {
997 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
998 mask &= ~((uint)PermissionMask.Copy >> 13);
999 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
1000 mask &= ~((uint)PermissionMask.Transfer >> 13);
1001 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
1002 mask &= ~((uint)PermissionMask.Modify >> 13);
1003 }
1004 else
1005 {
1006 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1007 mask &= ~((uint)PermissionMask.Copy >> 13);
1008 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1009 mask &= ~((uint)PermissionMask.Transfer >> 13);
1010 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1011 mask &= ~((uint)PermissionMask.Modify >> 13);
1012 }
1013
1014 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1015 mask &= ~(uint)PermissionMask.Copy;
1016 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1017 mask &= ~(uint)PermissionMask.Transfer;
1018 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
1019 mask &= ~(uint)PermissionMask.Modify;
1020 } 1220 }
1221
1222 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1223 mask &= ~(uint)PermissionMask.Copy;
1224 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1225 mask &= ~(uint)PermissionMask.Transfer;
1226 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
1227 mask &= ~(uint)PermissionMask.Modify;
1021 } 1228 }
1022
1023 return mask; 1229 return mask;
1024 } 1230 }
1025 1231
1026 public void ApplyNextOwnerPermissions() 1232 public void ApplyNextOwnerPermissions()
1027 { 1233 {
1028 lock (m_items) 1234 foreach (TaskInventoryItem item in m_items.Values)
1029 { 1235 {
1030 foreach (TaskInventoryItem item in m_items.Values) 1236 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
1031 { 1237 {
1032 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) 1238 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1033 { 1239 item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
1034 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) 1240 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1035 item.CurrentPermissions &= ~(uint)PermissionMask.Copy; 1241 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
1036 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) 1242 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1037 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; 1243 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1038 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1039 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1040 }
1041 item.CurrentPermissions &= item.NextPermissions;
1042 item.BasePermissions &= item.NextPermissions;
1043 item.EveryonePermissions &= item.NextPermissions;
1044 item.OwnerChanged = true;
1045 item.PermsMask = 0;
1046 item.PermsGranter = UUID.Zero;
1047 } 1244 }
1245 item.OwnerChanged = true;
1246 item.CurrentPermissions &= item.NextPermissions;
1247 item.BasePermissions &= item.NextPermissions;
1248 item.EveryonePermissions &= item.NextPermissions;
1249 item.PermsMask = 0;
1250 item.PermsGranter = UUID.Zero;
1048 } 1251 }
1049 } 1252 }
1050 1253
1051 public void ApplyGodPermissions(uint perms) 1254 public void ApplyGodPermissions(uint perms)
1052 { 1255 {
1053 lock (m_items) 1256 foreach (TaskInventoryItem item in m_items.Values)
1054 { 1257 {
1055 foreach (TaskInventoryItem item in m_items.Values) 1258 item.CurrentPermissions = perms;
1056 { 1259 item.BasePermissions = perms;
1057 item.CurrentPermissions = perms;
1058 item.BasePermissions = perms;
1059 }
1060 } 1260 }
1061 1261
1062 m_inventorySerial++; 1262 m_inventorySerial++;
@@ -1069,17 +1269,13 @@ namespace OpenSim.Region.Framework.Scenes
1069 /// <returns></returns> 1269 /// <returns></returns>
1070 public bool ContainsScripts() 1270 public bool ContainsScripts()
1071 { 1271 {
1072 lock (m_items) 1272 foreach (TaskInventoryItem item in m_items.Values)
1073 { 1273 {
1074 foreach (TaskInventoryItem item in m_items.Values) 1274 if (item.InvType == (int)InventoryType.LSL)
1075 { 1275 {
1076 if (item.InvType == (int)InventoryType.LSL) 1276 return true;
1077 {
1078 return true;
1079 }
1080 } 1277 }
1081 } 1278 }
1082
1083 return false; 1279 return false;
1084 } 1280 }
1085 1281
@@ -1087,11 +1283,8 @@ namespace OpenSim.Region.Framework.Scenes
1087 { 1283 {
1088 List<UUID> ret = new List<UUID>(); 1284 List<UUID> ret = new List<UUID>();
1089 1285
1090 lock (m_items) 1286 foreach (TaskInventoryItem item in m_items.Values)
1091 { 1287 ret.Add(item.ItemID);
1092 foreach (TaskInventoryItem item in m_items.Values)
1093 ret.Add(item.ItemID);
1094 }
1095 1288
1096 return ret; 1289 return ret;
1097 } 1290 }
@@ -1122,6 +1315,11 @@ namespace OpenSim.Region.Framework.Scenes
1122 1315
1123 public Dictionary<UUID, string> GetScriptStates() 1316 public Dictionary<UUID, string> GetScriptStates()
1124 { 1317 {
1318 return GetScriptStates(false);
1319 }
1320
1321 public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
1322 {
1125 Dictionary<UUID, string> ret = new Dictionary<UUID, string>(); 1323 Dictionary<UUID, string> ret = new Dictionary<UUID, string>();
1126 1324
1127 if (m_part.ParentGroup.Scene == null) // Group not in a scene 1325 if (m_part.ParentGroup.Scene == null) // Group not in a scene
@@ -1132,25 +1330,35 @@ namespace OpenSim.Region.Framework.Scenes
1132 if (engines.Length == 0) // No engine at all 1330 if (engines.Length == 0) // No engine at all
1133 return ret; 1331 return ret;
1134 1332
1135 List<TaskInventoryItem> scripts = GetInventoryScripts(); 1333 Items.LockItemsForRead(true);
1136 1334 foreach (TaskInventoryItem item in m_items.Values)
1137 foreach (TaskInventoryItem item in scripts)
1138 { 1335 {
1139 foreach (IScriptModule e in engines) 1336 if (item.InvType == (int)InventoryType.LSL)
1140 { 1337 {
1141 if (e != null) 1338 foreach (IScriptModule e in engines)
1142 { 1339 {
1143 string n = e.GetXMLState(item.ItemID); 1340 if (e != null)
1144 if (n != String.Empty)
1145 { 1341 {
1146 if (!ret.ContainsKey(item.ItemID)) 1342 string n = e.GetXMLState(item.ItemID);
1147 ret[item.ItemID] = n; 1343 if (n != String.Empty)
1148 break; 1344 {
1345 if (oldIDs)
1346 {
1347 if (!ret.ContainsKey(item.OldItemID))
1348 ret[item.OldItemID] = n;
1349 }
1350 else
1351 {
1352 if (!ret.ContainsKey(item.ItemID))
1353 ret[item.ItemID] = n;
1354 }
1355 break;
1356 }
1149 } 1357 }
1150 } 1358 }
1151 } 1359 }
1152 } 1360 }
1153 1361 Items.LockItemsForRead(false);
1154 return ret; 1362 return ret;
1155 } 1363 }
1156 1364
@@ -1160,21 +1368,27 @@ namespace OpenSim.Region.Framework.Scenes
1160 if (engines.Length == 0) 1368 if (engines.Length == 0)
1161 return; 1369 return;
1162 1370
1163 List<TaskInventoryItem> scripts = GetInventoryScripts();
1164 1371
1165 foreach (TaskInventoryItem item in scripts) 1372 Items.LockItemsForRead(true);
1373
1374 foreach (TaskInventoryItem item in m_items.Values)
1166 { 1375 {
1167 foreach (IScriptModule engine in engines) 1376 if (item.InvType == (int)InventoryType.LSL)
1168 { 1377 {
1169 if (engine != null) 1378 foreach (IScriptModule engine in engines)
1170 { 1379 {
1171 if (item.OwnerChanged) 1380 if (engine != null)
1172 engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER }); 1381 {
1173 item.OwnerChanged = false; 1382 if (item.OwnerChanged)
1174 engine.ResumeScript(item.ItemID); 1383 engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
1384 item.OwnerChanged = false;
1385 engine.ResumeScript(item.ItemID);
1386 }
1175 } 1387 }
1176 } 1388 }
1177 } 1389 }
1390
1391 Items.LockItemsForRead(false);
1178 } 1392 }
1179 } 1393 }
1180} 1394}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5c56150..bac356e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Region.Framework.Scenes
168// private int m_lastColCount = -1; //KF: Look for Collision chnages 168// private int m_lastColCount = -1; //KF: Look for Collision chnages
169// private int m_updateCount = 0; //KF: Update Anims for a while 169// private int m_updateCount = 0; //KF: Update Anims for a while
170// private static readonly int UPDATE_COUNT = 10; // how many frames to update for 170// private static readonly int UPDATE_COUNT = 10; // how many frames to update for
171 private List<uint> m_lastColliders = new List<uint>();
171 172
172 private TeleportFlags m_teleportFlags; 173 private TeleportFlags m_teleportFlags;
173 public TeleportFlags TeleportFlags 174 public TeleportFlags TeleportFlags
@@ -229,6 +230,9 @@ namespace OpenSim.Region.Framework.Scenes
229 //private int m_moveToPositionStateStatus; 230 //private int m_moveToPositionStateStatus;
230 //***************************************************** 231 //*****************************************************
231 232
233 private bool m_collisionEventFlag = false;
234 private object m_collisionEventLock = new Object();
235
232 protected AvatarAppearance m_appearance; 236 protected AvatarAppearance m_appearance;
233 237
234 public AvatarAppearance Appearance 238 public AvatarAppearance Appearance
@@ -1837,6 +1841,7 @@ namespace OpenSim.Region.Framework.Scenes
1837 if (part.SitTargetAvatar == UUID) 1841 if (part.SitTargetAvatar == UUID)
1838 part.SitTargetAvatar = UUID.Zero; 1842 part.SitTargetAvatar = UUID.Zero;
1839 1843
1844 part.ParentGroup.DeleteAvatar(UUID);
1840 ParentPosition = part.GetWorldPosition(); 1845 ParentPosition = part.GetWorldPosition();
1841 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1846 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1842 } 1847 }
@@ -1975,7 +1980,7 @@ namespace OpenSim.Region.Framework.Scenes
1975 forceMouselook = part.GetForceMouselook(); 1980 forceMouselook = part.GetForceMouselook();
1976 1981
1977 ControllingClient.SendSitResponse( 1982 ControllingClient.SendSitResponse(
1978 targetID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); 1983 part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
1979 1984
1980 m_requestedSitTargetUUID = targetID; 1985 m_requestedSitTargetUUID = targetID;
1981 1986
@@ -2260,11 +2265,13 @@ namespace OpenSim.Region.Framework.Scenes
2260 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT; 2265 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
2261 Rotation = sitTargetOrient; 2266 Rotation = sitTargetOrient;
2262 ParentPosition = part.AbsolutePosition; 2267 ParentPosition = part.AbsolutePosition;
2268 part.ParentGroup.AddAvatar(UUID);
2263 } 2269 }
2264 else 2270 else
2265 { 2271 {
2266 m_pos -= part.AbsolutePosition; 2272 m_pos -= part.AbsolutePosition;
2267 ParentPosition = part.AbsolutePosition; 2273 ParentPosition = part.AbsolutePosition;
2274 part.ParentGroup.AddAvatar(UUID);
2268 2275
2269// m_log.DebugFormat( 2276// m_log.DebugFormat(
2270// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target", 2277// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
@@ -3370,6 +3377,8 @@ namespace OpenSim.Region.Framework.Scenes
3370 } 3377 }
3371 } 3378 }
3372 3379
3380 RaiseCollisionScriptEvents(coldata);
3381
3373 if (Invulnerable) 3382 if (Invulnerable)
3374 return; 3383 return;
3375 3384
@@ -3881,6 +3890,12 @@ namespace OpenSim.Region.Framework.Scenes
3881 3890
3882 private void CheckAndAdjustLandingPoint(ref Vector3 pos) 3891 private void CheckAndAdjustLandingPoint(ref Vector3 pos)
3883 { 3892 {
3893 string reason;
3894
3895 // Honor bans
3896 if (!m_scene.TestLandRestrictions(UUID, out reason, ref pos.X, ref pos.Y))
3897 return;
3898
3884 SceneObjectGroup telehub = null; 3899 SceneObjectGroup telehub = null;
3885 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null) 3900 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null)
3886 { 3901 {
@@ -3920,11 +3935,173 @@ namespace OpenSim.Region.Framework.Scenes
3920 pos = land.LandData.UserLocation; 3935 pos = land.LandData.UserLocation;
3921 } 3936 }
3922 } 3937 }
3923 3938
3924 land.SendLandUpdateToClient(ControllingClient); 3939 land.SendLandUpdateToClient(ControllingClient);
3925 } 3940 }
3926 } 3941 }
3927 3942
3943 private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata)
3944 {
3945 lock(m_collisionEventLock)
3946 {
3947 if (m_collisionEventFlag)
3948 return;
3949 m_collisionEventFlag = true;
3950 }
3951
3952 Util.FireAndForget(delegate(object x)
3953 {
3954 try
3955 {
3956 List<uint> thisHitColliders = new List<uint>();
3957 List<uint> endedColliders = new List<uint>();
3958 List<uint> startedColliders = new List<uint>();
3959
3960 foreach (uint localid in coldata.Keys)
3961 {
3962 thisHitColliders.Add(localid);
3963 if (!m_lastColliders.Contains(localid))
3964 {
3965 startedColliders.Add(localid);
3966 }
3967 //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
3968 }
3969
3970 // calculate things that ended colliding
3971 foreach (uint localID in m_lastColliders)
3972 {
3973 if (!thisHitColliders.Contains(localID))
3974 {
3975 endedColliders.Add(localID);
3976 }
3977 }
3978 //add the items that started colliding this time to the last colliders list.
3979 foreach (uint localID in startedColliders)
3980 {
3981 m_lastColliders.Add(localID);
3982 }
3983 // remove things that ended colliding from the last colliders list
3984 foreach (uint localID in endedColliders)
3985 {
3986 m_lastColliders.Remove(localID);
3987 }
3988
3989 // do event notification
3990 if (startedColliders.Count > 0)
3991 {
3992 ColliderArgs StartCollidingMessage = new ColliderArgs();
3993 List<DetectedObject> colliding = new List<DetectedObject>();
3994 foreach (uint localId in startedColliders)
3995 {
3996 if (localId == 0)
3997 continue;
3998
3999 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
4000 string data = "";
4001 if (obj != null)
4002 {
4003 DetectedObject detobj = new DetectedObject();
4004 detobj.keyUUID = obj.UUID;
4005 detobj.nameStr = obj.Name;
4006 detobj.ownerUUID = obj.OwnerID;
4007 detobj.posVector = obj.AbsolutePosition;
4008 detobj.rotQuat = obj.GetWorldRotation();
4009 detobj.velVector = obj.Velocity;
4010 detobj.colliderType = 0;
4011 detobj.groupUUID = obj.GroupID;
4012 colliding.Add(detobj);
4013 }
4014 }
4015
4016 if (colliding.Count > 0)
4017 {
4018 StartCollidingMessage.Colliders = colliding;
4019
4020 foreach (SceneObjectGroup att in GetAttachments())
4021 Scene.EventManager.TriggerScriptCollidingStart(att.LocalId, StartCollidingMessage);
4022 }
4023 }
4024
4025 if (endedColliders.Count > 0)
4026 {
4027 ColliderArgs EndCollidingMessage = new ColliderArgs();
4028 List<DetectedObject> colliding = new List<DetectedObject>();
4029 foreach (uint localId in endedColliders)
4030 {
4031 if (localId == 0)
4032 continue;
4033
4034 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
4035 string data = "";
4036 if (obj != null)
4037 {
4038 DetectedObject detobj = new DetectedObject();
4039 detobj.keyUUID = obj.UUID;
4040 detobj.nameStr = obj.Name;
4041 detobj.ownerUUID = obj.OwnerID;
4042 detobj.posVector = obj.AbsolutePosition;
4043 detobj.rotQuat = obj.GetWorldRotation();
4044 detobj.velVector = obj.Velocity;
4045 detobj.colliderType = 0;
4046 detobj.groupUUID = obj.GroupID;
4047 colliding.Add(detobj);
4048 }
4049 }
4050
4051 if (colliding.Count > 0)
4052 {
4053 EndCollidingMessage.Colliders = colliding;
4054
4055 foreach (SceneObjectGroup att in GetAttachments())
4056 Scene.EventManager.TriggerScriptCollidingEnd(att.LocalId, EndCollidingMessage);
4057 }
4058 }
4059
4060 if (thisHitColliders.Count > 0)
4061 {
4062 ColliderArgs CollidingMessage = new ColliderArgs();
4063 List<DetectedObject> colliding = new List<DetectedObject>();
4064 foreach (uint localId in thisHitColliders)
4065 {
4066 if (localId == 0)
4067 continue;
4068
4069 SceneObjectPart obj = Scene.GetSceneObjectPart(localId);
4070 string data = "";
4071 if (obj != null)
4072 {
4073 DetectedObject detobj = new DetectedObject();
4074 detobj.keyUUID = obj.UUID;
4075 detobj.nameStr = obj.Name;
4076 detobj.ownerUUID = obj.OwnerID;
4077 detobj.posVector = obj.AbsolutePosition;
4078 detobj.rotQuat = obj.GetWorldRotation();
4079 detobj.velVector = obj.Velocity;
4080 detobj.colliderType = 0;
4081 detobj.groupUUID = obj.GroupID;
4082 colliding.Add(detobj);
4083 }
4084 }
4085
4086 if (colliding.Count > 0)
4087 {
4088 CollidingMessage.Colliders = colliding;
4089
4090 lock (m_attachments)
4091 {
4092 foreach (SceneObjectGroup att in m_attachments)
4093 Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
4094 }
4095 }
4096 }
4097 }
4098 finally
4099 {
4100 m_collisionEventFlag = false;
4101 }
4102 });
4103 }
4104
3928 private void TeleportFlagsDebug() { 4105 private void TeleportFlagsDebug() {
3929 4106
3930 // Some temporary debugging help to show all the TeleportFlags we have... 4107 // Some temporary debugging help to show all the TeleportFlags we have...
@@ -3949,6 +4126,5 @@ namespace OpenSim.Region.Framework.Scenes
3949 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************"); 4126 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
3950 4127
3951 } 4128 }
3952
3953 } 4129 }
3954} 4130}
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 7c60ddd..c776fa5 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -345,6 +345,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
345 m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2); 345 m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2);
346 m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3); 346 m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3);
347 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); 347 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4);
348
349 m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy);
350 m_SOPXmlProcessors.Add("VolumeDetectActive", ProcessVolumeDetectActive);
348 #endregion 351 #endregion
349 352
350 #region TaskInventoryXmlProcessors initialization 353 #region TaskInventoryXmlProcessors initialization
@@ -729,6 +732,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
729 obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); 732 obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty);
730 } 733 }
731 734
735 private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader)
736 {
737 obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty);
738 }
739
740 private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlTextReader reader)
741 {
742 obj.VolumeDetectActive = Util.ReadBoolean(reader);
743 }
744
732 #endregion 745 #endregion
733 746
734 #region TaskInventoryXmlProcessors 747 #region TaskInventoryXmlProcessors
@@ -1212,6 +1225,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1212 writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); 1225 writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString());
1213 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); 1226 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString());
1214 1227
1228 writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
1229 writer.WriteElementString("VolumeDetectActive", sop.VolumeDetectActive.ToString().ToLower());
1230
1215 writer.WriteEndElement(); 1231 writer.WriteEndElement();
1216 } 1232 }
1217 1233
@@ -1496,12 +1512,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1496 { 1512 {
1497 TaskInventoryDictionary tinv = new TaskInventoryDictionary(); 1513 TaskInventoryDictionary tinv = new TaskInventoryDictionary();
1498 1514
1499 if (reader.IsEmptyElement)
1500 {
1501 reader.Read();
1502 return tinv;
1503 }
1504
1505 reader.ReadStartElement(name, String.Empty); 1515 reader.ReadStartElement(name, String.Empty);
1506 1516
1507 while (reader.Name == "TaskInventoryItem") 1517 while (reader.Name == "TaskInventoryItem")
@@ -1544,12 +1554,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1544 1554
1545 PrimitiveBaseShape shape = new PrimitiveBaseShape(); 1555 PrimitiveBaseShape shape = new PrimitiveBaseShape();
1546 1556
1547 if (reader.IsEmptyElement)
1548 {
1549 reader.Read();
1550 return shape;
1551 }
1552
1553 reader.ReadStartElement(name, String.Empty); // Shape 1557 reader.ReadStartElement(name, String.Empty); // Shape
1554 1558
1555 string nodeName = string.Empty; 1559 string nodeName = string.Empty;
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 860172c..5ed3c79 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -30,12 +30,27 @@ using System.Reflection;
30using log4net; 30using log4net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using System;
33 34
34namespace OpenSim.Region.Framework.Scenes 35namespace OpenSim.Region.Framework.Scenes
35{ 36{
37 [Flags]
38 public enum UndoType
39 {
40 STATE_PRIM_POSITION = 1,
41 STATE_PRIM_ROTATION = 2,
42 STATE_PRIM_SCALE = 4,
43 STATE_PRIM_ALL = 7,
44 STATE_GROUP_POSITION = 8,
45 STATE_GROUP_ROTATION = 16,
46 STATE_GROUP_SCALE = 32,
47 STATE_GROUP_ALL = 56,
48 STATE_ALL = 63
49 }
50
36 public class UndoState 51 public class UndoState
37 { 52 {
38// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 53 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 54
40 public Vector3 Position = Vector3.Zero; 55 public Vector3 Position = Vector3.Zero;
41 public Vector3 Scale = Vector3.Zero; 56 public Vector3 Scale = Vector3.Zero;
@@ -57,37 +72,37 @@ namespace OpenSim.Region.Framework.Scenes
57 { 72 {
58 ForGroup = forGroup; 73 ForGroup = forGroup;
59 74
60// if (ForGroup) 75 // if (ForGroup)
61 Position = part.ParentGroup.AbsolutePosition; 76 Position = part.ParentGroup.AbsolutePosition;
62// else 77 // else
63// Position = part.OffsetPosition; 78 // Position = part.OffsetPosition;
64 79
65// m_log.DebugFormat( 80 // m_log.DebugFormat(
66// "[UNDO STATE]: Storing undo position {0} for root part", Position); 81 // "[UNDO STATE]: Storing undo position {0} for root part", Position);
67 82
68 Rotation = part.RotationOffset; 83 Rotation = part.RotationOffset;
69 84
70// m_log.DebugFormat( 85 // m_log.DebugFormat(
71// "[UNDO STATE]: Storing undo rotation {0} for root part", Rotation); 86 // "[UNDO STATE]: Storing undo rotation {0} for root part", Rotation);
72 87
73 Scale = part.Shape.Scale; 88 Scale = part.Shape.Scale;
74 89
75// m_log.DebugFormat( 90 // m_log.DebugFormat(
76// "[UNDO STATE]: Storing undo scale {0} for root part", Scale); 91 // "[UNDO STATE]: Storing undo scale {0} for root part", Scale);
77 } 92 }
78 else 93 else
79 { 94 {
80 Position = part.OffsetPosition; 95 Position = part.OffsetPosition;
81// m_log.DebugFormat( 96 // m_log.DebugFormat(
82// "[UNDO STATE]: Storing undo position {0} for child part", Position); 97 // "[UNDO STATE]: Storing undo position {0} for child part", Position);
83 98
84 Rotation = part.RotationOffset; 99 Rotation = part.RotationOffset;
85// m_log.DebugFormat( 100 // m_log.DebugFormat(
86// "[UNDO STATE]: Storing undo rotation {0} for child part", Rotation); 101 // "[UNDO STATE]: Storing undo rotation {0} for child part", Rotation);
87 102
88 Scale = part.Shape.Scale; 103 Scale = part.Shape.Scale;
89// m_log.DebugFormat( 104 // m_log.DebugFormat(
90// "[UNDO STATE]: Storing undo scale {0} for child part", Scale); 105 // "[UNDO STATE]: Storing undo scale {0} for child part", Scale);
91 } 106 }
92 } 107 }
93 108
@@ -121,9 +136,9 @@ namespace OpenSim.Region.Framework.Scenes
121 136
122 if (part.ParentID == 0) 137 if (part.ParentID == 0)
123 { 138 {
124// m_log.DebugFormat( 139 // m_log.DebugFormat(
125// "[UNDO STATE]: Undoing position to {0} for root part {1} {2}", 140 // "[UNDO STATE]: Undoing position to {0} for root part {1} {2}",
126// Position, part.Name, part.LocalId); 141 // Position, part.Name, part.LocalId);
127 142
128 if (Position != Vector3.Zero) 143 if (Position != Vector3.Zero)
129 { 144 {
@@ -133,9 +148,9 @@ namespace OpenSim.Region.Framework.Scenes
133 part.ParentGroup.UpdateRootPosition(Position); 148 part.ParentGroup.UpdateRootPosition(Position);
134 } 149 }
135 150
136// m_log.DebugFormat( 151 // m_log.DebugFormat(
137// "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}", 152 // "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}",
138// part.RotationOffset, Rotation, part.Name, part.LocalId); 153 // part.RotationOffset, Rotation, part.Name, part.LocalId);
139 154
140 if (ForGroup) 155 if (ForGroup)
141 part.UpdateRotation(Rotation); 156 part.UpdateRotation(Rotation);
@@ -144,9 +159,9 @@ namespace OpenSim.Region.Framework.Scenes
144 159
145 if (Scale != Vector3.Zero) 160 if (Scale != Vector3.Zero)
146 { 161 {
147// m_log.DebugFormat( 162 // m_log.DebugFormat(
148// "[UNDO STATE]: Undoing scale {0} to {1} for root part {2} {3}", 163 // "[UNDO STATE]: Undoing scale {0} to {1} for root part {2} {3}",
149// part.Shape.Scale, Scale, part.Name, part.LocalId); 164 // part.Shape.Scale, Scale, part.Name, part.LocalId);
150 165
151 if (ForGroup) 166 if (ForGroup)
152 part.ParentGroup.GroupResize(Scale); 167 part.ParentGroup.GroupResize(Scale);
@@ -161,24 +176,24 @@ namespace OpenSim.Region.Framework.Scenes
161 // Note: Updating these properties on sop automatically schedules an update if needed 176 // Note: Updating these properties on sop automatically schedules an update if needed
162 if (Position != Vector3.Zero) 177 if (Position != Vector3.Zero)
163 { 178 {
164// m_log.DebugFormat( 179 // m_log.DebugFormat(
165// "[UNDO STATE]: Undoing position {0} to {1} for child part {2} {3}", 180 // "[UNDO STATE]: Undoing position {0} to {1} for child part {2} {3}",
166// part.OffsetPosition, Position, part.Name, part.LocalId); 181 // part.OffsetPosition, Position, part.Name, part.LocalId);
167 182
168 part.OffsetPosition = Position; 183 part.OffsetPosition = Position;
169 } 184 }
170 185
171// m_log.DebugFormat( 186 // m_log.DebugFormat(
172// "[UNDO STATE]: Undoing rotation {0} to {1} for child part {2} {3}", 187 // "[UNDO STATE]: Undoing rotation {0} to {1} for child part {2} {3}",
173// part.RotationOffset, Rotation, part.Name, part.LocalId); 188 // part.RotationOffset, Rotation, part.Name, part.LocalId);
174 189
175 part.UpdateRotation(Rotation); 190 part.UpdateRotation(Rotation);
176 191
177 if (Scale != Vector3.Zero) 192 if (Scale != Vector3.Zero)
178 { 193 {
179// m_log.DebugFormat( 194 // m_log.DebugFormat(
180// "[UNDO STATE]: Undoing scale {0} to {1} for child part {2} {3}", 195 // "[UNDO STATE]: Undoing scale {0} to {1} for child part {2} {3}",
181// part.Shape.Scale, Scale, part.Name, part.LocalId); 196 // part.Shape.Scale, Scale, part.Name, part.LocalId);
182 197
183 part.Resize(Scale); 198 part.Resize(Scale);
184 } 199 }
@@ -247,4 +262,4 @@ namespace OpenSim.Region.Framework.Scenes
247 m_terrainModule.UndoTerrain(m_terrainChannel); 262 m_terrainModule.UndoTerrain(m_terrainChannel);
248 } 263 }
249 } 264 }
250} \ No newline at end of file 265}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index efb68a2..411e421 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -87,10 +87,6 @@ namespace OpenSim.Region.Framework.Scenes
87 /// <param name="assetUuids">The assets gathered</param> 87 /// <param name="assetUuids">The assets gathered</param>
88 public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) 88 public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
89 { 89 {
90 // avoid infinite loops
91 if (assetUuids.ContainsKey(assetUuid))
92 return;
93
94 try 90 try
95 { 91 {
96 assetUuids[assetUuid] = assetType; 92 assetUuids[assetUuid] = assetType;
generated by cgit v1.1 at 2024-12-20 10:11:22 +0000