diff options
author | John Hurliman | 2009-10-21 16:24:17 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-21 16:24:17 -0700 |
commit | 2b39ff0a39229f1cea513b12e6d093e31c40d0b2 (patch) | |
tree | 9b5637ecf48129b025fafec5eeed19c852e13716 /OpenSim/Region/OptionalModules/Avatar | |
parent | * FireQueueEmpty now checks if a measurable amount of time has passed, and if... (diff) | |
parent | Fix llParticleSystem to accept LSL variables and LSL constants in place (diff) | |
download | opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.zip opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.gz opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.bz2 opensim-SC-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.xz |
Merged master into prioritization
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 16 |
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 | } |