2 files changed, 20 insertions, 33 deletions

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index b9d64b1..d6d8dde 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework
         public Vector3 LeftAxis;
         public Vector3 UpAxis;
         //public int GodLevel;
-        public OSD GodData = new OSDMap();
+        public OSD GodData = null;
         public bool ChangedGrid;
 
         // This probably shouldn't be here
@@ -119,12 +119,15 @@ namespace OpenSim.Framework
             args["far"] = OSD.FromReal(Far);
             args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
             //args["god_level"] = OSD.FromString(GodLevel.ToString());
-            args["god_data"] = GodData;
-            OSDMap g = (OSDMap)GodData;
-            // Set legacy value
-            // TODO: remove after 0.9 is superseded
-            if (g.ContainsKey("ViewerUiIsGod"))
-                args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;;
+            if(GodData != null)
+            {
+                args["god_data"] = GodData;
+                OSDMap g = (OSDMap)GodData;
+                // Set legacy value
+                // TODO: remove after 0.9 is superseded
+                if (g.ContainsKey("ViewerUiIsGod"))
+                    args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;
+            }
 
             if ((Throttles != null) && (Throttles.Length > 0))
                 args["throttles"] = OSD.FromBinary(Throttles);
@@ -185,7 +188,7 @@ namespace OpenSim.Framework
 
             //if (args["god_level"] != null)
             //    Int32.TryParse(args["god_level"].AsString(), out GodLevel);
-            if (args["god_data"] != null)
+            if (args.ContainsKey("god_data") && args["god_data"] != null)
                 GodData = args["god_data"];
 
             if (args["far"] != null)
@@ -362,7 +365,7 @@ namespace OpenSim.Framework
         public Quaternion BodyRotation;
         public uint ControlFlags;
         public float EnergyLevel;
-        public OSD GodData = new OSDMap();
+        public OSD GodData = null;
         //public Byte GodLevel;
         public bool AlwaysRun;
         public UUID PreyAgent;
@@ -438,10 +441,13 @@ namespace OpenSim.Framework
 
             args["energy_level"] = OSD.FromReal(EnergyLevel);
             //args["god_level"] = OSD.FromString(GodLevel.ToString());
-            args["god_data"] = GodData;
-            OSDMap g = (OSDMap)GodData;
-            if (g.ContainsKey("ViewerUiIsGod"))
-                args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;;
+            if(GodData != null)
+            {
+                args["god_data"] = GodData;
+                OSDMap g = (OSDMap)GodData;
+                if (g.ContainsKey("ViewerUiIsGod"))
+                    args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;;
+            }
             args["always_run"] = OSD.FromBoolean(AlwaysRun);
             args["prey_agent"] = OSD.FromUUID(PreyAgent);
             args["agent_access"] = OSD.FromString(AgentAccess.ToString());
@@ -622,7 +628,7 @@ namespace OpenSim.Framework
             //if (args["god_level"] != null)
             //    Byte.TryParse(args["god_level"].AsString(), out GodLevel);
 
-            if (args["god_data"] != null)
+            if (args.ContainsKey("god_data") && args["god_data"] != null)
                 GodData = args["god_data"];
 
             if (args["always_run"] != null)
diff --git a/OpenSim/Framework/PermissionsUtil.cs b/OpenSim/Framework/PermissionsUtil.cs
index 5d3186d..3dce04d 100644
--- a/OpenSim/Framework/PermissionsUtil.cs
+++ b/OpenSim/Framework/PermissionsUtil.cs
@@ -64,24 +64,5 @@ namespace OpenSim.Framework
                 str = ".";
             return str;
         }
-
-        /// <summary>
-        /// Applies an object's folded permissions to its regular permissions.
-        /// </summary>
-        /// <param name="foldedPerms">The folded permissions. Only the lowest 7 bits are examined.</param>
-        /// <param name="mainPerms">The permissions variable to modify.</param>
-        public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms)
-        {
-//            if ((foldedPerms & 7) == 0)
-//                return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded
-
-            if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0)
-                mainPerms &= ~(uint)PermissionMask.Copy;
-            if ((foldedPerms & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                mainPerms &= ~(uint)PermissionMask.Transfer;
-            if ((foldedPerms & ((uint)PermissionMask.Modify >> 13)) == 0)
-                mainPerms &= ~(uint)PermissionMask.Modify;
-        }
-
     }
 }