Merge branch 'master' into httptests

6 files changed, 63 insertions, 64 deletions

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 72c2c34..74f18bf 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -353,6 +353,10 @@ namespace OpenSim.Framework
         public UUID PreyAgent;
         public Byte AgentAccess;
         public UUID ActiveGroupID;
+        public string ActiveGroupName;
+        public string ActiveGroupTitle = null;
+        public UUID agentCOF;
+        public byte CrossingFlags;
 
         public AgentGroupData[] Groups;
         public Dictionary<ulong, string> ChildrenCapSeeds = null;
@@ -361,7 +365,6 @@ namespace OpenSim.Framework
         public Animation AnimState = null;
         public Byte MotionState = 0;
 
-        public UUID GranterID;
         public UUID ParentPart;
         public Vector3 SitOffset;
 
@@ -374,12 +377,6 @@ namespace OpenSim.Framework
                 MethodBase.GetCurrentMethod().DeclaringType);
 // DEBUG OFF
 
-/*
-        public byte[] AgentTextures;
-        public byte[] VisualParams;
-        public UUID[] Wearables;
-        public AvatarAttachment[] Attachments;
-*/
         // Scripted
         public ControllerData[] Controllers;
 
@@ -393,8 +390,6 @@ namespace OpenSim.Framework
 
         public virtual OSDMap Pack(EntityTransferContext ctx)
         {
-            int wearablesCount = -1;
-
 //            m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Pack data");
 
             OSDMap args = new OSDMap();
@@ -433,8 +428,14 @@ namespace OpenSim.Framework
             args["prey_agent"] = OSD.FromUUID(PreyAgent);
             args["agent_access"] = OSD.FromString(AgentAccess.ToString());
 
+            args["agent_cof"] = OSD.FromUUID(agentCOF);
+            args["crossingflags"] = OSD.FromInteger(CrossingFlags);
+
             args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
-          
+            args["active_group_name"] = OSD.FromString(ActiveGroupName);
+            if(ActiveGroupTitle != null)
+                args["active_group_title"] = OSD.FromString(ActiveGroupTitle);
+           
             if ((Groups != null) && (Groups.Length > 0))
             {
                 OSDArray groups = new OSDArray(Groups.Length);
@@ -497,48 +498,6 @@ namespace OpenSim.Framework
             if (Appearance != null)
                 args["packed_appearance"] = Appearance.Pack(ctx);
 
-            //if ((AgentTextures != null) && (AgentTextures.Length > 0))
-            //{
-            //    OSDArray textures = new OSDArray(AgentTextures.Length);
-            //    foreach (UUID uuid in AgentTextures)
-            //        textures.Add(OSD.FromUUID(uuid));
-            //    args["agent_textures"] = textures;
-            //}
-
-            // The code to pack textures, visuals, wearables and attachments
-            // should be removed; packed appearance contains the full appearance
-            // This is retained for backward compatibility only
-
-/*  then lets remove
-            if (Appearance.Texture != null)
-            {
-                byte[] rawtextures = Appearance.Texture.GetBytes();
-                args["texture_entry"] = OSD.FromBinary(rawtextures);
-            }
-
-            if ((Appearance.VisualParams != null) && (Appearance.VisualParams.Length > 0))
-                args["visual_params"] = OSD.FromBinary(Appearance.VisualParams);
-
-            // We might not pass this in all cases...
-            if ((Appearance.Wearables != null) && (Appearance.Wearables.Length > 0))
-            {
-                OSDArray wears = new OSDArray(Appearance.Wearables.Length);
-                foreach (AvatarWearable awear in Appearance.Wearables)
-                    wears.Add(awear.Pack());
-
-                args["wearables"] = wears;
-            }
-
-            List<AvatarAttachment> attachments = Appearance.GetAttachments();
-            if ((attachments != null) && (attachments.Count > 0))
-            {
-                OSDArray attachs = new OSDArray(attachments.Count);
-                foreach (AvatarAttachment att in attachments)
-                    attachs.Add(att.Pack());
-                args["attachments"] = attachs;
-            }
-            // End of code to remove
-*/
             if ((Controllers != null) && (Controllers.Length > 0))
             {
                 OSDArray controls = new OSDArray(Controllers.Length);
@@ -662,10 +621,22 @@ namespace OpenSim.Framework
             if (args["agent_access"] != null)
                 Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
 
-            if (args["active_group_id"] != null)
+            if (args.ContainsKey("agent_cof") && args["agent_cof"] != null)
+                agentCOF = args["agent_cof"].AsUUID();
+
+            if (args.ContainsKey("crossingflags") && args["crossingflags"] != null)
+                CrossingFlags = (byte)args["crossingflags"].AsInteger();
+
+            if (args.ContainsKey("active_group_id") && args["active_group_id"] != null)
                 ActiveGroupID = args["active_group_id"].AsUUID();
 
-            if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
+            if (args.ContainsKey("active_group_name") && args["active_group_name"] != null)
+                ActiveGroupName = args["active_group_name"].AsString();
+            
+            if(args.ContainsKey("active_group_title") && args["active_group_title"] != null)
+                ActiveGroupTitle = args["active_group_title"].AsString();
+
+            if (args.ContainsKey("groups") && (args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
             {
                 OSDArray groups = (OSDArray)(args["groups"]);
                 Groups = new AgentGroupData[groups.Count];
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index da3690c..53d98db 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Framework
         public uint ParentEstateID;
         public Guid RegionID;
         public uint timestamp;
+        public Guid ID;
 
         public GridInstantMessage()
         {
@@ -66,6 +67,8 @@ namespace OpenSim.Framework
             Position = im.Position;
             binaryBucket = im.binaryBucket;
             RegionID = im.RegionID;
+            ParentEstateID = im.ParentEstateID;
+            ID = im.ID;
 
             if (addTimestamp)
                 timestamp = (uint)Util.UnixTimeSinceEpoch();
@@ -75,7 +78,7 @@ namespace OpenSim.Framework
                 string _fromAgentName, UUID _toAgentID,
                 byte _dialog, bool _fromGroup, string _message,
                 UUID _imSessionID, bool _offline, Vector3 _position,
-                byte[] _binaryBucket, bool addTimestamp)
+                byte[] _binaryBucket, UUID _ID, bool addTimestamp)
         {
             fromAgentID = _fromAgentID.Guid;
             fromAgentName = _fromAgentName;
@@ -84,6 +87,8 @@ namespace OpenSim.Framework
             fromGroup = _fromGroup;
             message = _message;
             imSessionID = _imSessionID.Guid;
+            ID = _ID.Guid;
+
             if (_offline)
                 offline = 1;
             else
@@ -102,11 +107,21 @@ namespace OpenSim.Framework
         }
 
         public GridInstantMessage(IScene scene, UUID _fromAgentID,
+                string _fromAgentName, UUID _toAgentID,
+                byte _dialog, bool _fromGroup, string _message,
+                UUID _imSessionID, bool _offline, Vector3 _position,
+                byte[] _binaryBucket, bool addTimestamp) : this (scene, _fromAgentID,
+                    _fromAgentName, _toAgentID, _dialog, _fromGroup, _message,
+                    _imSessionID, _offline, _position, _binaryBucket, UUID.Zero, addTimestamp)
+        {
+        }
+
+        public GridInstantMessage(IScene scene, UUID _fromAgentID,
                 string _fromAgentName, UUID _toAgentID, byte _dialog,
                 string _message, bool _offline,
                 Vector3 _position) : this(scene, _fromAgentID, _fromAgentName,
                 _toAgentID, _dialog, false, _message,
-                _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], true)
+                _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], UUID.Zero, true)
         {
         }
     }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index d9932eb..9bf51f8 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -727,11 +727,15 @@ namespace OpenSim.Framework
 
         UUID SecureSessionId { get; }
 
-        UUID ActiveGroupId { get; }
+        UUID ActiveGroupId { get; set; }
 
-        string ActiveGroupName { get; }
+        string ActiveGroupName { get; set;}
 
-        ulong ActiveGroupPowers { get; }
+        ulong ActiveGroupPowers { get; set;}
+
+        Dictionary<UUID, ulong> GetGroupPowers();
+
+        void SetGroupPowers(Dictionary<UUID, ulong> powers);
 
         ulong GetGroupPowers(UUID groupID);
 
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 55c9613..be45438 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -32,14 +32,13 @@ namespace OpenSim.Framework
     public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount);
     public interface IMoneyModule
     {
-        bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
-                int amount, UUID txn, out string reason);
+        bool ObjectGiveMoney(UUID objectID, UUID fromID,
+                UUID toID, int amount, UUID txn, out string reason);
 
         int GetBalance(UUID agentID);
         bool UploadCovered(UUID agentID, int amount);
         bool AmountCovered(UUID agentID, int amount);
-        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type);
-        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData);
+        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData = "");
         void ApplyUploadCharge(UUID agentID, int amount, string text);
         void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);
 
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index be11931..1848b17 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Framework
         /// </summary>
         bool IsChildAgent { get; }
 
+        bool Invulnerable { get; set; }
         /// <summary>
         /// Avatar appearance data.
         /// </summary>
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 3426d10..1d4deac 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -157,7 +157,16 @@ namespace OpenSim.Framework.Servers
                 "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
                 Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
             
-            StartupSpecific();
+            try
+            {
+                StartupSpecific();
+            }
+            catch(Exception e)
+            {
+                m_log.FatalFormat("Fatal error: {0}",
+                    (e.Message == null || e.Message == String.Empty) ? "Unknown reason":e.Message );
+                Environment.Exit(1);
+            }
             
             TimeSpan timeTaken = DateTime.Now - m_startuptime;