Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
author: Melanie 2011-11-06 20:54:13 +0000
committer: Melanie 2011-11-06 20:54:13 +0000
commit: 323b76cee4a9e90de3c7a2bad76c9d27a7953c2d (patch)
tree: 57b11cd3cb52af5502d2b8945e0f9c5f3bf6c108 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parent: Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff)
parent: Make the AsyncSceneObjectDeleter send a list of kills. This will make large (diff)
download: opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.zip
opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.gz
opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.bz2
opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6e20f90..a12a17c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1485,7 +1485,7 @@ namespace OpenSim.Region.Framework.Scenes
                        {
                            if (!IsAttachment || (AttachedAvatar == avatar.ControllingClient.AgentId) || 
                                (AttachmentPoint < 31) || (AttachmentPoint > 38))
-                                avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint>() {part.LocalId});
+                                avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
                        }
                    }
                });
author	Melanie	2011-11-06 20:54:13 +0000
committer	Melanie	2011-11-06 20:54:13 +0000
commit	323b76cee4a9e90de3c7a2bad76c9d27a7953c2d (patch)
tree	57b11cd3cb52af5502d2b8945e0f9c5f3bf6c108 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parent	Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff)
parent	Make the AsyncSceneObjectDeleter send a list of kills. This will make large (diff)
download	opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.zip opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.gz opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.bz2 opensim-SC_OLD-323b76cee4a9e90de3c7a2bad76c9d27a7953c2d.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 6e20f90..a12a17c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1485,7 +1485,7 @@ namespace OpenSim.Region.Framework.Scenes
1485	{	1485	{
1486	if (!IsAttachment \|\| (AttachedAvatar == avatar.ControllingClient.AgentId) \|\|	1486	if (!IsAttachment \|\| (AttachedAvatar == avatar.ControllingClient.AgentId) \|\|
1487	(AttachmentPoint < 31) \|\| (AttachmentPoint > 38))	1487	(AttachmentPoint < 31) \|\| (AttachmentPoint > 38))
1488	avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint>() {part.LocalId});	1488	avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
1489	}	1489	}
1490	}	1490	}
1491	});	1491	});