diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 17b59da..9de564b 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1580,7 +1580,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1580 | OutPacket(pc, ThrottleOutPacketType.Unknown); | 1580 | OutPacket(pc, ThrottleOutPacketType.Unknown); |
1581 | } | 1581 | } |
1582 | 1582 | ||
1583 | public void SendKillObject(ulong regionHandle, List<uint> localIDs) | 1583 | public void SendKillObject(List<uint> localIDs) |
1584 | { | 1584 | { |
1585 | // foreach (uint id in localIDs) | 1585 | // foreach (uint id in localIDs) |
1586 | // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle); | 1586 | // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle); |
@@ -11961,8 +11961,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11961 | if (part == null) | 11961 | if (part == null) |
11962 | { | 11962 | { |
11963 | // It's a ghost! tell the client to delete it from view. | 11963 | // It's a ghost! tell the client to delete it from view. |
11964 | simClient.SendKillObject(Scene.RegionInfo.RegionHandle, | 11964 | simClient.SendKillObject(new List<uint> { localId }); |
11965 | new List<uint> { localId }); | ||
11966 | } | 11965 | } |
11967 | else | 11966 | else |
11968 | { | 11967 | { |