aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-10-21 18:45:37 +0100
committerMelanie2009-10-21 18:45:37 +0100
commit8dd15fd5a590e059038d6438a305264cad3918b7 (patch)
tree6012552caa61f1273bcfcd2ee3fca864fbf13d92
parentFix web map retrieval for regions configured via .ini (diff)
downloadopensim-SC_OLD-8dd15fd5a590e059038d6438a305264cad3918b7.zip
opensim-SC_OLD-8dd15fd5a590e059038d6438a305264cad3918b7.tar.gz
opensim-SC_OLD-8dd15fd5a590e059038d6438a305264cad3918b7.tar.bz2
opensim-SC_OLD-8dd15fd5a590e059038d6438a305264cad3918b7.tar.xz
Patch by mcortez: Remove lock from scene presence updating in groups module
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs16
1 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index b209199..b2544fa 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1244,18 +1244,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1244 if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Updating scene title for {0} with title: {1}", AgentID, Title); 1244 if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Updating scene title for {0} with title: {1}", AgentID, Title);
1245 1245
1246 ScenePresence presence = null; 1246 ScenePresence presence = null;
1247 lock (m_sceneList) 1247
1248 foreach (Scene scene in m_sceneList)
1248 { 1249 {
1249 foreach (Scene scene in m_sceneList) 1250 presence = scene.GetScenePresence(AgentID);
1251 if (presence != null)
1250 { 1252 {
1251 presence = scene.GetScenePresence(AgentID); 1253 presence.Grouptitle = Title;
1252 if (presence != null)
1253 {
1254 presence.Grouptitle = Title;
1255 1254
1256 // FixMe: Ter suggests a "Schedule" method that I can't find. 1255 // FixMe: Ter suggests a "Schedule" method that I can't find.
1257 presence.SendFullUpdateToAllClients(); 1256 presence.SendFullUpdateToAllClients();
1258 }
1259 } 1257 }
1260 } 1258 }
1261 } 1259 }