diff options
author | Melanie | 2011-10-27 18:14:38 +0100 |
---|---|---|
committer | Melanie | 2011-10-27 18:14:38 +0100 |
commit | b975cbcbed71b12898052395fbc83a5880273190 (patch) | |
tree | f149288740af5227a865783a51f566bef537721e /OpenSim/Region/CoreModules/World/Estate | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | Removed use of 'is' operator and casting to find the root ScenePresence in Me... (diff) | |
download | opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.zip opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.tar.gz opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.tar.bz2 opensim-SC_OLD-b975cbcbed71b12898052395fbc83a5880273190.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 321f6b6..1471bc9 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -678,11 +678,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
678 | if (!Scene.Permissions.CanIssueEstateCommand(remover_client.AgentId, false)) | 678 | if (!Scene.Permissions.CanIssueEstateCommand(remover_client.AgentId, false)) |
679 | return; | 679 | return; |
680 | 680 | ||
681 | Scene.ForEachScenePresence(delegate(ScenePresence sp) | 681 | Scene.ForEachRootScenePresence(delegate(ScenePresence p) |
682 | { | 682 | { |
683 | if (sp.UUID != senderID) | 683 | if (p.UUID != senderID) |
684 | { | 684 | { |
685 | ScenePresence p = Scene.GetScenePresence(sp.UUID); | ||
686 | // make sure they are still there, we could be working down a long list | 685 | // make sure they are still there, we could be working down a long list |
687 | // Also make sure they are actually in the region | 686 | // Also make sure they are actually in the region |
688 | if (p != null && !p.IsChildAgent) | 687 | if (p != null && !p.IsChildAgent) |
@@ -953,10 +952,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
953 | 952 | ||
954 | public void sendRegionInfoPacketToAll() | 953 | public void sendRegionInfoPacketToAll() |
955 | { | 954 | { |
956 | Scene.ForEachScenePresence(delegate(ScenePresence sp) | 955 | Scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
957 | { | 956 | { |
958 | if (!sp.IsChildAgent) | 957 | HandleRegionInfoRequest(sp.ControllingClient); |
959 | HandleRegionInfoRequest(sp.ControllingClient); | ||
960 | }); | 958 | }); |
961 | } | 959 | } |
962 | 960 | ||