add npc create option OS_NPC_OBJECT_GROUP. with it the npc will be created with the group of the object with the script, if that object owner is member of that group. This should allow parcel access by group to work now, and not much else. The groupTitle will also be set, it the region option NoNPCGroup is not active.

2 files changed, 92 insertions, 64 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index c863528..bda323a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2593,7 +2593,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             
             bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0;
 
-            return NpcCreate(firstname, lastname, position, notecard, owned, false);
+            return NpcCreate(firstname, lastname, position, notecard, owned, false, false);
         }
 
         public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@@ -2604,101 +2604,128 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return NpcCreate(
                 firstname, lastname, position, notecard,
                 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
-                (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
+                (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0,
+                (options & ScriptBaseClass.OS_NPC_OBJECT_GROUP) != 0);
         }
 
         private LSL_Key NpcCreate(
-            string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
+            string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent, bool hostGroupID)
         {
 
             if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
                 return new LSL_Key(UUID.Zero.ToString());
 
             INPCModule module = World.RequestModuleInterface<INPCModule>();
-            if (module != null)
+            if(module == null)
+                new LSL_Key(UUID.Zero.ToString());
+
+            string groupTitle = String.Empty;
+            UUID groupID = UUID.Zero;
+
+            AvatarAppearance appearance = null;
+
+            // check creation options
+            NPCOptionsFlags createFlags = module.NPCOptionFlags;
+
+            if((createFlags & NPCOptionsFlags.AllowNotOwned) == 0 && !owned)
             {
-                string groupTitle = String.Empty;
-                AvatarAppearance appearance = null;
+                OSSLError("Not owned NPCs disabled");
+                owned = true; // we should get here...
+            }
 
-                // check creation options
-                NPCOptionsFlags createFlags = module.NPCOptionFlags;
+            if((createFlags & NPCOptionsFlags.AllowSenseAsAvatar) == 0 && senseAsAgent)
+            {
+                OSSLError("NPC allow sense as Avatar disabled");
+                senseAsAgent = false;
+            }
 
-                if((createFlags & NPCOptionsFlags.AllowNotOwned) == 0 && !owned)
+            if(hostGroupID && m_host.GroupID != UUID.Zero)
+            {
+                IGroupsModule groupsModule = m_ScriptEngine.World.RequestModuleInterface<IGroupsModule>();
+                if (groupsModule != null)
                 {
-                    OSSLError("Not owned NPCs disabled");
-                    owned = true; // we should get here...
-                }
+                    GroupMembershipData member = groupsModule.GetMembershipData(m_host.GroupID, m_host.OwnerID);
+                    if (member == null)
+                    {
+                        OSSLError(string.Format("osNpcCreate: the object owner is not member of the object group"));
+                        return new LSL_Key(UUID.Zero.ToString());
+                    }
 
-                if((createFlags & NPCOptionsFlags.AllowSenseAsAvatar) == 0 && senseAsAgent)
-                {
-                    OSSLError("NPC allow sense as Avatar disabled");
-                    senseAsAgent = false;
+                    groupID = m_host.GroupID;
+
+                    if((createFlags & NPCOptionsFlags.NoNPCGroup) != 0)
+                    {
+                        GroupRecord grprec = groupsModule.GetGroupRecord(m_host.GroupID);
+                        if(grprec != null && grprec.GroupName != "")
+                            groupTitle = grprec.GroupName;
+                    }
                 }
+            }
 
-                if((createFlags & NPCOptionsFlags.NoNPCGroup) == 0)
+            if((createFlags & NPCOptionsFlags.NoNPCGroup) == 0)
+            {
+                if (firstname != String.Empty || lastname != String.Empty)
                 {
-                    if (firstname != String.Empty || lastname != String.Empty)
-                        {
-                            if (firstname != "Shown outfit:")
-                                groupTitle = "- NPC -";
-                        }
+                    if (firstname != "Shown outfit:")
+                        groupTitle = "- NPC -";
                 }
+            }
                
-                if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0)
+            if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0)
+            {
+                UUID id;
+                if (UUID.TryParse(notecard, out id))
                 {
-                    UUID id;
-                    if (UUID.TryParse(notecard, out id))
-                    {
-                        ScenePresence clonePresence = World.GetScenePresence(id);
-                        if (clonePresence != null)
-                            appearance = clonePresence.Appearance;
-                    }
+                    ScenePresence clonePresence = World.GetScenePresence(id);
+                    if (clonePresence != null)
+                        appearance = clonePresence.Appearance;
                 }
+            }
 
-                if (appearance == null)
-                {
-                    string appearanceSerialized = LoadNotecard(notecard);
+            if (appearance == null)
+            {
+                string appearanceSerialized = LoadNotecard(notecard);
 
-                    if (appearanceSerialized != null)
+                if (appearanceSerialized != null)
+                {
+                    try
                     {
-                        try
-                        {
-                            OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
-                            appearance = new AvatarAppearance();
-                            appearance.Unpack(appearanceOsd);
-                        }
-                        catch
-                        {
-                            return UUID.Zero.ToString();
-                        }
+                        OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
+                        appearance = new AvatarAppearance();
+                        appearance.Unpack(appearanceOsd);
                     }
-                    else
+                    catch
                     {
-                        OSSLError(string.Format("osNpcCreate: Notecard reference '{0}' not found.", notecard));
+                        OSSLError(string.Format("osNpcCreate: Error processing notcard '{0}'", notecard));
+                        return new LSL_Key(UUID.Zero.ToString());
                     }
                 }
-
-                UUID ownerID = UUID.Zero;
-                if (owned)
-                    ownerID = m_host.OwnerID;
-                UUID x = module.CreateNPC(firstname,
-                                          lastname,
-                                          position,
-                                          ownerID,
-                                          senseAsAgent,
-                                          World,
-                                          appearance);
-
-                ScenePresence sp;
-                if (World.TryGetScenePresence(x, out sp))
+            else
                 {
-                    sp.Grouptitle = groupTitle;
-                    sp.SendAvatarDataToAllAgents();
+                    OSSLError(string.Format("osNpcCreate: Notecard reference '{0}' not found.", notecard));
                 }
-                return new LSL_Key(x.ToString());
             }
 
-            return new LSL_Key(UUID.Zero.ToString());
+            UUID ownerID = UUID.Zero;
+            if (owned)
+                ownerID = m_host.OwnerID;
+            UUID x = module.CreateNPC(firstname,
+                                      lastname,
+                                      position,
+                                      ownerID,
+                                      senseAsAgent,
+                                      World,
+                                      appearance);
+
+            ScenePresence sp;
+            if (World.TryGetScenePresence(x, out sp))
+            {
+                sp.Grouptitle = groupTitle;
+                ((INPC)(sp.ControllingClient)).ActiveGroupId = groupID;
+                     
+                sp.SendAvatarDataToAllAgents();
+            }
+            return new LSL_Key(x.ToString());
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 158acc6..4a8e885 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -763,6 +763,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int OS_NPC_CREATOR_OWNED = 0x1;
         public const int OS_NPC_NOT_OWNED = 0x2;
         public const int OS_NPC_SENSE_AS_AGENT = 0x4;
+        public const int OS_NPC_OBJECT_GROUP = 0x08;
 
         public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
         public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";