From c72f78215bb3435ee2bbb507746c23eccec4dd34 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 4 Nov 2009 01:56:19 +0000
Subject: Backport the fixes to WebFetchInventoryDescendents to the UDP
 InventoryDescendents packet. Testing has shown that UDP inventory now works
 flawlessly and, unlike CAPS inventory, doesn't download the entire agent
 inventory on start. Neither does it incessantly re-request folder NULL_KEY.
 Therefore, I have disabled CAPS inventory.

---
 OpenSim/Framework/IClientAPI.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/IClientAPI.cs')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d304345..0f88b93 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1124,7 +1124,7 @@ namespace OpenSim.Framework
         void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler);
 
         void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items,
-                                        List<InventoryFolderBase> folders, bool fetchFolders,
+                                        List<InventoryFolderBase> folders, int version, bool fetchFolders,
                                         bool fetchItems);
 
         void FlushPrimUpdates();
-- 
cgit v1.1


From 83b4b4440b7becb405840bc69d665e260fdecea0 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 5 Nov 2009 02:09:07 +0000
Subject: Patch by revolution, thank you. Mantis #1789 . Implement friends
 permissions. Applied with major changes. Core functionality commented pending
 review for possible rights escalation. No user functionality yet.

---
 OpenSim/Framework/IClientAPI.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Framework/IClientAPI.cs')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 0f88b93..ee7ab87 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -446,6 +446,7 @@ namespace OpenSim.Framework
     public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
     public delegate void MuteListRequest(IClientAPI client, uint muteCRC);
     public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
+    public delegate void GrantUserFriendRights(IClientAPI client, UUID requester, UUID target, int rights);
     public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
 
     public delegate void AgentFOV(IClientAPI client, float verticalAngle);
@@ -1023,6 +1024,7 @@ namespace OpenSim.Framework
         event PickInfoUpdate OnPickInfoUpdate;
         event AvatarNotesUpdate OnAvatarNotesUpdate;
         event AvatarInterestUpdate OnAvatarInterestUpdate;
+        event GrantUserFriendRights OnGrantUserRights;
 
         event MuteListRequest OnMuteListRequest;
 
-- 
cgit v1.1


From 5145dfa53c2fd8ce0c9ece73ae44f36c9cc70931 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 9 Nov 2009 17:13:56 -0800
Subject: * Removing the redundant SendPrimitiveTerseData.State field, it
 duplicates AttachPoint * LLClientView.CreateImprovedTerseBlock() now uses
 AttachPoint and does the proper high-low swap (this should fix disappearing
 attachment pieces)

---
 OpenSim/Framework/IClientAPI.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'OpenSim/Framework/IClientAPI.cs')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index ee7ab87..04ba9c6 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -592,7 +592,6 @@ namespace OpenSim.Framework
         public readonly Vector3 Velocity;
         public readonly Vector3 Acceleration;
         public readonly Vector3 AngularVelocity;
-        public readonly byte State;
         public readonly UUID AssetID;
         public readonly UUID OwnerID;
         public readonly int AttachPoint;
@@ -600,7 +599,7 @@ namespace OpenSim.Framework
         public readonly double Priority;
 
         public SendPrimitiveTerseData(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
-            Quaternion rotation, Vector3 velocity, Vector3 acceleration, Vector3 rotationalvelocity, byte state,
+            Quaternion rotation, Vector3 velocity, Vector3 acceleration, Vector3 rotationalvelocity,
             UUID assetID, UUID ownerID, int attachPoint, byte[] textureEntry, double priority)
         {
             RegionHandle = regionHandle;
@@ -611,7 +610,6 @@ namespace OpenSim.Framework
             Velocity = velocity;
             Acceleration = acceleration;
             AngularVelocity = rotationalvelocity;
-            State = state;
             AssetID = assetID;
             OwnerID = ownerID;
             AttachPoint = attachPoint;
-- 
cgit v1.1