diff options
author | UbitUmarov | 2014-08-02 19:33:38 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-02 19:33:38 +0100 |
commit | 46da95d1b73ebe4a8fe4f27a3b16f46317a403ef (patch) | |
tree | ed8f566e13931bca204f67ffe61a8e657a4dba53 /OpenSim/Region | |
parent | dont fire a thread on npc creation keeping the main one just waiting (diff) | |
download | opensim-SC_OLD-46da95d1b73ebe4a8fe4f27a3b16f46317a403ef.zip opensim-SC_OLD-46da95d1b73ebe4a8fe4f27a3b16f46317a403ef.tar.gz opensim-SC_OLD-46da95d1b73ebe4a8fe4f27a3b16f46317a403ef.tar.bz2 opensim-SC_OLD-46da95d1b73ebe4a8fe4f27a3b16f46317a403ef.tar.xz |
bug hunt: disable group for npc
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index faaf74c..edaa69c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1149,10 +1149,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1149 | // Should not be needed if we are not trying to tell this region to close | 1149 | // Should not be needed if we are not trying to tell this region to close |
1150 | // DoNotCloseAfterTeleport = false; | 1150 | // DoNotCloseAfterTeleport = false; |
1151 | 1151 | ||
1152 | IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); | 1152 | IGroupsModule gm = null; |
1153 | if (gm != null) | 1153 | if (!isNPC) // disable groups ofr NPCs BUG HUNT |
1154 | Grouptitle = gm.GetGroupTitle(m_uuid); | 1154 | { |
1155 | 1155 | ||
1156 | gm = m_scene.RequestModuleInterface<IGroupsModule>(); | ||
1157 | if (gm != null) | ||
1158 | Grouptitle = gm.GetGroupTitle(m_uuid); | ||
1159 | } | ||
1156 | RegionHandle = m_scene.RegionInfo.RegionHandle; | 1160 | RegionHandle = m_scene.RegionInfo.RegionHandle; |
1157 | 1161 | ||
1158 | m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); | 1162 | m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); |
@@ -1165,6 +1169,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1165 | // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status | 1169 | // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status |
1166 | try | 1170 | try |
1167 | { | 1171 | { |
1172 | |||
1168 | if (gm != null) | 1173 | if (gm != null) |
1169 | { | 1174 | { |
1170 | groupUUID = ControllingClient.ActiveGroupId; | 1175 | groupUUID = ControllingClient.ActiveGroupId; |