aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-08-02 21:01:44 +0100
committerUbitUmarov2014-08-02 21:01:44 +0100
commit35616339f3a57b27601495aaee9599554f0e779d (patch)
tree6edbf4c286fd0606f877b53875a0d2e0cabac0a6 /OpenSim
parentbug hunt: disable group for npc (diff)
downloadopensim-SC_OLD-35616339f3a57b27601495aaee9599554f0e779d.zip
opensim-SC_OLD-35616339f3a57b27601495aaee9599554f0e779d.tar.gz
opensim-SC_OLD-35616339f3a57b27601495aaee9599554f0e779d.tar.bz2
opensim-SC_OLD-35616339f3a57b27601495aaee9599554f0e779d.tar.xz
remove the groups restrictions for npcs since they do nothing usefull
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs16
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index edaa69c..a9a6ba4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -984,7 +984,7 @@ namespace OpenSim.Region.Framework.Scenes
984 984
985 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 985 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
986 if (gm != null) 986 if (gm != null)
987 Grouptitle = gm.GetGroupTitle(m_uuid); 987 Grouptitle = gm.GetGroupTitle(m_uuid);
988 988
989 m_scriptEngines = m_scene.RequestModuleInterfaces<IScriptModule>(); 989 m_scriptEngines = m_scene.RequestModuleInterfaces<IScriptModule>();
990 990
@@ -1149,14 +1149,10 @@ 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 = null; 1152 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
1153 if (!isNPC) // disable groups ofr NPCs BUG HUNT 1153 if (gm != null)
1154 { 1154 Grouptitle = gm.GetGroupTitle(m_uuid);
1155 1155
1156 gm = m_scene.RequestModuleInterface<IGroupsModule>();
1157 if (gm != null)
1158 Grouptitle = gm.GetGroupTitle(m_uuid);
1159 }
1160 RegionHandle = m_scene.RegionInfo.RegionHandle; 1156 RegionHandle = m_scene.RegionInfo.RegionHandle;
1161 1157
1162 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); 1158 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
@@ -1858,7 +1854,7 @@ namespace OpenSim.Region.Framework.Scenes
1858 ValidateAndSendAppearanceAndAgentData(); 1854 ValidateAndSendAppearanceAndAgentData();
1859 1855
1860 // Create child agents in neighbouring regions 1856 // Create child agents in neighbouring regions
1861 if (openChildAgents && !IsChildAgent && !isNPC) 1857 if (openChildAgents && !IsChildAgent)
1862 { 1858 {
1863 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); 1859 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
1864 if (m_agentTransfer != null) 1860 if (m_agentTransfer != null)