ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
This commit is contained in:
Melanie
2013-05-11 02:35:26 +01:00
parent cdaceea5a6 55c9bc15e5
commit 13cd8c17d7
27 changed files with 206 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -1857,11 +1857,11 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary>
/// Delete this group from its scene.
/// </summary>
///
/// <remarks>
/// This only handles the in-world consequences of deletion (e.g. any avatars sitting on it are forcibly stood
/// up and all avatars receive notification of its removal. Removal of the scene object from database backup
/// must be handled by the caller.
///
/// </remarks>
/// <param name="silent">If true then deletion is not broadcast to clients</param>
public void DeleteGroupFromScene(bool silent)
{
@@ -1875,10 +1875,10 @@ namespace OpenSim.Region.Framework.Scenes
{
SceneObjectPart part = parts[i];
Scene.ForEachRootScenePresence(delegate(ScenePresence avatar)
Scene.ForEachScenePresence(sp =>
{
if (avatar.ParentID == LocalId)
avatar.StandUp();
if (!sp.IsChildAgent && sp.ParentID == LocalId)
sp.StandUp();
if (!silent)
{
@@ -1886,9 +1886,9 @@ namespace OpenSim.Region.Framework.Scenes
if (part == m_rootPart)
{
if (!IsAttachment
|| AttachedAvatar == avatar.ControllingClient.AgentId
|| AttachedAvatar == sp.UUID
|| !HasPrivateAttachmentPoint)
avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
sp.ControllingClient.SendKillObject(new List<uint> { part.LocalId });
}
}
});