diff options
| author | Melanie | 2013-05-11 01:29:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 01:29:30 +0100 |
| commit | 55c9bc15e571065f66190e017f973f6e1ac43428 (patch) | |
| tree | 537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/Region/ClientStack | |
| parent | Send up the part missing from the Avination Estate commit. (diff) | |
| parent | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff) | |
| download | opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -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 47dd842..e014471 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -1588,7 +1588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 1588 | OutPacket(pc, ThrottleOutPacketType.Unknown); | 1588 | OutPacket(pc, ThrottleOutPacketType.Unknown); |
| 1589 | } | 1589 | } |
| 1590 | 1590 | ||
| 1591 | public void SendKillObject(ulong regionHandle, List<uint> localIDs) | 1591 | public void SendKillObject(List<uint> localIDs) |
| 1592 | { | 1592 | { |
| 1593 | // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); | 1593 | // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); |
| 1594 | 1594 | ||
| @@ -11555,8 +11555,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 11555 | if (part == null) | 11555 | if (part == null) |
| 11556 | { | 11556 | { |
| 11557 | // It's a ghost! tell the client to delete it from view. | 11557 | // It's a ghost! tell the client to delete it from view. |
| 11558 | simClient.SendKillObject(Scene.RegionInfo.RegionHandle, | 11558 | simClient.SendKillObject(new List<uint> { localId }); |
| 11559 | new List<uint> { localId }); | ||
| 11560 | } | 11559 | } |
| 11561 | else | 11560 | else |
| 11562 | { | 11561 | { |