bug hunt: disable group for npc

avinationmerge
UbitUmarov 2014-08-02 19:33:38 +01:00
parent 01981fdf58
commit 46da95d1b7
1 changed files with 8 additions and 3 deletions

View File

@ -1149,10 +1149,14 @@ namespace OpenSim.Region.Framework.Scenes
// Should not be needed if we are not trying to tell this region to close // Should not be needed if we are not trying to tell this region to close
// DoNotCloseAfterTeleport = false; // DoNotCloseAfterTeleport = false;
IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); IGroupsModule gm = null;
if (gm != null) if (!isNPC) // disable groups ofr NPCs BUG HUNT
Grouptitle = gm.GetGroupTitle(m_uuid); {
gm = m_scene.RequestModuleInterface<IGroupsModule>();
if (gm != null)
Grouptitle = gm.GetGroupTitle(m_uuid);
}
RegionHandle = m_scene.RegionInfo.RegionHandle; RegionHandle = m_scene.RegionInfo.RegionHandle;
m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
@ -1165,6 +1169,7 @@ namespace OpenSim.Region.Framework.Scenes
// Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
try try
{ {
if (gm != null) if (gm != null)
{ {
groupUUID = ControllingClient.ActiveGroupId; groupUUID = ControllingClient.ActiveGroupId;