From a08c354a0737aa1c39e8abd1bc77446c5ace2997 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 28 Jun 2016 18:14:30 +0100
Subject: fix NPCs OS_NPC_OBJECT_GROUP option. group ID needs to be set during
 creation, before scenepresence.CompleteMovement, set tittle just after it.

---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index d40fa48..8462661 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -157,14 +157,14 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         }
 
         public UUID CreateNPC(string firstname, string lastname,
-                Vector3 position, UUID owner, bool senseAsAgent, Scene scene,
+                Vector3 position, UUID owner,  bool senseAsAgent, Scene scene,
                 AvatarAppearance appearance)
         {
-            return CreateNPC(firstname, lastname, position, UUID.Zero, owner, senseAsAgent, scene, appearance);
+            return CreateNPC(firstname, lastname, position, UUID.Zero, owner, "", UUID.Zero, senseAsAgent, scene, appearance);
         }
 
         public UUID CreateNPC(string firstname, string lastname,
-                Vector3 position, UUID agentID, UUID owner, bool senseAsAgent, Scene scene,
+                Vector3 position, UUID agentID, UUID owner, string groupTitle, UUID groupID, bool senseAsAgent, Scene scene,
                 AvatarAppearance appearance)
         {
             NPCAvatar npcAvatar = null;
@@ -222,8 +222,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
                     {
-                        
+                        npcAvatar.ActiveGroupId = groupID;
                         sp.CompleteMovement(npcAvatar, false);
+                        sp.Grouptitle = groupTitle;
                         m_avatars.Add(npcAvatar.AgentId, npcAvatar);
 //                        m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
                     }
-- 
cgit v1.1