diff options
| author | Justin Clark-Casey (justincc) | 2011-10-28 23:16:46 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-28 23:16:46 +0100 |
| commit | 0fe756e42c23dabf3b754f3675597aaf6fb627c4 (patch) | |
| tree | aa9ebe244f7efe03b8e8cbf80a70b6fb34a6dade /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups | |
| parent | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fet... (diff) | |
| parent | Removed use of 'is' operator and casting to find the root ScenePresence in Me... (diff) | |
| download | opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.zip opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.gz opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.bz2 opensim-SC-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 15 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 11 |
2 files changed, 12 insertions, 14 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index a12e6ea..10b83e6 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | |||
| @@ -504,19 +504,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 504 | // Try root avatar first | 504 | // Try root avatar first |
| 505 | foreach (Scene scene in m_sceneList) | 505 | foreach (Scene scene in m_sceneList) |
| 506 | { | 506 | { |
| 507 | if (scene.Entities.ContainsKey(agentID) && | 507 | ScenePresence sp = scene.GetScenePresence(agentID); |
| 508 | scene.Entities[agentID] is ScenePresence) | 508 | if (sp != null) |
| 509 | { | 509 | { |
| 510 | ScenePresence user = (ScenePresence)scene.Entities[agentID]; | 510 | if (!sp.IsChildAgent) |
| 511 | if (!user.IsChildAgent) | ||
| 512 | { | 511 | { |
| 513 | if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found root agent for client : {0}", user.ControllingClient.Name); | 512 | if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found root agent for client : {0}", sp.ControllingClient.Name); |
| 514 | return user.ControllingClient; | 513 | return sp.ControllingClient; |
| 515 | } | 514 | } |
| 516 | else | 515 | else |
| 517 | { | 516 | { |
| 518 | if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found child agent for client : {0}", user.ControllingClient.Name); | 517 | if (m_debugEnabled) m_log.WarnFormat("[GROUPS-MESSAGING]: Found child agent for client : {0}", sp.ControllingClient.Name); |
| 519 | child = user.ControllingClient; | 518 | child = sp.ControllingClient; |
| 520 | } | 519 | } |
| 521 | } | 520 | } |
| 522 | } | 521 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 630fcab..b2c0f48 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
| @@ -1076,17 +1076,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 1076 | // Try root avatar first | 1076 | // Try root avatar first |
| 1077 | foreach (Scene scene in m_sceneList) | 1077 | foreach (Scene scene in m_sceneList) |
| 1078 | { | 1078 | { |
| 1079 | if (scene.Entities.ContainsKey(agentID) && | 1079 | ScenePresence sp = scene.GetScenePresence(agentID); |
| 1080 | scene.Entities[agentID] is ScenePresence) | 1080 | if (sp != null) |
| 1081 | { | 1081 | { |
| 1082 | ScenePresence user = (ScenePresence)scene.Entities[agentID]; | 1082 | if (!sp.IsChildAgent) |
| 1083 | if (!user.IsChildAgent) | ||
| 1084 | { | 1083 | { |
| 1085 | return user.ControllingClient; | 1084 | return sp.ControllingClient; |
| 1086 | } | 1085 | } |
| 1087 | else | 1086 | else |
| 1088 | { | 1087 | { |
| 1089 | child = user.ControllingClient; | 1088 | child = sp.ControllingClient; |
| 1090 | } | 1089 | } |
| 1091 | } | 1090 | } |
| 1092 | } | 1091 | } |