First part of avatar persistence, currently only really works in standalone mode (with accounts_authenticate set to true), it also only currently has a mysql database connector. (sqlite one will follow soon). It also uses the tribalmedia database system, so this needs checking to see if the old problems with mono have been fixed.

To use, see the appearance section in opensim.ini.example, set "persist = true", then add the correct connection string for your database.(see mysql-AvatarAppearance.sql in share folder for a example of the table mysql table structure).
This could possible be used in a very small grid, but would mean each region server would need to connect to the same mysql database. 
But the work to move the code to one of the grid servers shouldn't be too much. 

1 files changed, 26 insertions, 23 deletions

diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 9640ed7..6c49586 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -170,31 +170,9 @@ namespace OpenSim.Region.Environment
             // the administrator object permissions to take effect.
             LLUUID objectOwner = task.OwnerID;
 
-            //return task.RootPart.ObjectFlags;task.RootPart.ObjectFlags | 
-
             uint objectOwnerMask = task.RootPart.ObjectFlags;
+            objectOwnerMask = ApplyObjectModifyMasks(task.RootPart.OwnerMask, objectOwnerMask);
 
-            if((task.RootPart.OwnerMask & (uint)PermissionMask.Copy) != 0)
-            {
-                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectCopy;
-            }
-
-            if ((task.RootPart.OwnerMask & (uint) PermissionMask.Move) != 0)
-            {
-                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectMove;
-            }
-
-            if ((task.RootPart.OwnerMask & (uint) PermissionMask.Modify) != 0)
-            {
-                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectModify;
-            }
-
-            if ((task.RootPart.OwnerMask & (uint) PermissionMask.Transfer) != 0)
-            {
-                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectTransfer;
-            }
-
-            uint objectGroupMask = task.RootPart.ObjectFlags | task.RootPart.GroupMask;
             uint objectEveryoneMask = task.RootPart.ObjectFlags | task.RootPart.EveryoneMask;
 
             if (m_bypassPermissions)
@@ -240,6 +218,31 @@ namespace OpenSim.Region.Environment
             return objectEveryoneMask;
         }
 
+
+        private uint ApplyObjectModifyMasks(uint parentMask, uint objectOwnerMask)
+        {
+            if ((parentMask & (uint)PermissionMask.Copy) != 0)
+            {
+                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectCopy;
+            }
+
+            if ((parentMask & (uint)PermissionMask.Move) != 0)
+            {
+                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectMove;
+            }
+
+            if ((parentMask & (uint)PermissionMask.Modify) != 0)
+            {
+                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectModify;
+            }
+
+            if ((parentMask & (uint)PermissionMask.Transfer) != 0)
+            {
+                objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectTransfer;
+            }
+            return objectOwnerMask;
+        }
+
         protected virtual bool GenericObjectPermission(LLUUID currentUser, LLUUID objId)
         {
             // Default: deny