aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2011-11-06 20:38:07 +0000
committerMelanie2011-11-06 20:38:07 +0000
commitc7dd7b13a2058fa6855e2e78f1dbb83e9a806f95 (patch)
tree2208d841ddd01013d590845f306d2719ecf96503 /OpenSim/Region/CoreModules
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-c7dd7b13a2058fa6855e2e78f1dbb83e9a806f95.zip
opensim-SC_OLD-c7dd7b13a2058fa6855e2e78f1dbb83e9a806f95.tar.gz
opensim-SC_OLD-c7dd7b13a2058fa6855e2e78f1dbb83e9a806f95.tar.bz2
opensim-SC_OLD-c7dd7b13a2058fa6855e2e78f1dbb83e9a806f95.tar.xz
Convert SendKillObject to take a list of uint rather than sending one
packet per prim. More to come as we change to make use of this.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index de99b94..2349e40 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -548,7 +548,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
548 // 548 //
549 if (so.IsSelected) 549 if (so.IsSelected)
550 { 550 {
551 m_scene.SendKillObject(so.RootPart.LocalId); 551 m_scene.SendKillObject(new List<uint> { so.RootPart.LocalId });
552 } 552 }
553 553
554 so.IsSelected = false; // fudge.... 554 so.IsSelected = false; // fudge....
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 7251bd8..d01f89b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
570 570
571 protected void KillEntity(Scene scene, uint localID) 571 protected void KillEntity(Scene scene, uint localID)
572 { 572 {
573 scene.SendKillObject(localID); 573 scene.SendKillObject(new List<uint> { localID });
574 } 574 }
575 575
576 protected virtual GridRegion GetFinalDestination(GridRegion region) 576 protected virtual GridRegion GetFinalDestination(GridRegion region)