Megapatch. :) Fix skull attachment editing. Streamline Object terse updates.

Add rezzing time to objects. Add Object return and traffic fields to land
database. Add plumbing for auto return. Implement auto return.
Contains a migration. May contain nuts.

3 files changed, 27 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 6371105..d242cb3 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -715,7 +715,7 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        private InventoryFolderImpl FindFolderForType(int type)
+        public InventoryFolderImpl FindFolderForType(int type)
         {
             if (RootFolder == null)
                 return null;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index db6025d..0bb790c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -95,6 +95,7 @@ namespace OpenSim.Framework
 
     // really don't want to be passing packets in these events, so this is very temporary.
     public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
+    public delegate void DeRezObject(IClientAPI remoteClient, uint localID, UUID groupID, byte destination, UUID destinationID);
 
     public delegate void GenericCall5(IClientAPI remoteClient, bool status);
 
@@ -319,6 +320,7 @@ namespace OpenSim.Framework
     public delegate void DirPopularQuery(IClientAPI remoteClient, UUID queryID, uint queryFlags);
     public delegate void DirClassifiedQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, uint category, int queryStart);
     public delegate void EventInfoRequest(IClientAPI remoteClient, uint eventID);
+    public delegate void ParcelSetOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime);
 
     public delegate void MapItemRequest(IClientAPI remoteClient, uint flags, uint EstateID, bool godlike, uint itemtype, ulong regionhandle);
 
@@ -468,7 +470,7 @@ namespace OpenSim.Framework
         event RequestAvatarProperties OnRequestAvatarProperties;
         event SetAlwaysRun OnSetAlwaysRun;
         event TeleportLandmarkRequest OnTeleportLandmarkRequest;
-        event GenericCall4 OnDeRezObject;
+        event DeRezObject OnDeRezObject;
         event Action<IClientAPI> OnRegionHandShakeReply;
         event GenericCall2 OnRequestWearables;
         event GenericCall2 OnCompleteMovementToRegion;
@@ -619,6 +621,7 @@ namespace OpenSim.Framework
         event DirPopularQuery OnDirPopularQuery;
         event DirClassifiedQuery OnDirClassifiedQuery;
         event EventInfoRequest OnEventInfoRequest;
+        event ParcelSetOtherCleanTime OnParcelSetOtherCleanTime;
         
         event MapItemRequest OnMapItemRequest;
 
@@ -700,9 +703,6 @@ namespace OpenSim.Framework
         void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
                                  Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId);
 
-        void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
-                                 Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity);
-
         void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items,
                                         List<InventoryFolderBase> folders, bool fetchFolders,
                                         bool fetchItems);
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 4e66721..7d29d10 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -77,6 +77,8 @@ namespace OpenSim.Framework
         private UUID _snapshotID = UUID.Zero;
         private Vector3 _userLocation = new Vector3();
         private Vector3 _userLookAt = new Vector3();
+        private int _dwell = 0;
+        private int _otherCleanTime = 0;
 
         public Vector3 AABBMax {
             get {
@@ -402,6 +404,24 @@ namespace OpenSim.Framework
             }
         }
 
+        public int Dwell {
+            get {
+                return _dwell;
+            }
+            set {
+                _dwell = value;
+            }
+        }
+
+        public int OtherCleanTime {
+            get {
+                return _otherCleanTime;
+            }
+            set {
+                _otherCleanTime = value;
+            }
+        }
+
         public LandData()
         {
             _globalID = UUID.Random();
@@ -444,6 +464,8 @@ namespace OpenSim.Framework
             landData._snapshotID = _snapshotID;
             landData._userLocation = _userLocation;
             landData._userLookAt = _userLookAt;
+            landData._otherCleanTime = _otherCleanTime;
+            landData._dwell = _dwell;
 
             landData._parcelAccessList.Clear();
             foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)