OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie 2010-10-10 22:08:54 +01:00
parent cb79e228e4 c2971a6398
commit 0806d03780
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
View File

@ -215,6 +215,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (im.dialog != (byte)InstantMessageDialog.MessageFromObject && if (im.dialog != (byte)InstantMessageDialog.MessageFromObject &&
im.dialog != (byte)InstantMessageDialog.MessageFromAgent && im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
im.dialog != (byte)InstantMessageDialog.GroupNotice && im.dialog != (byte)InstantMessageDialog.GroupNotice &&
im.dialog != (byte)InstantMessageDialog.GroupInvitation &&
im.dialog != (byte)InstantMessageDialog.InventoryOffered) im.dialog != (byte)InstantMessageDialog.InventoryOffered)
{ {
return; return;

28
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1697,14 +1697,14 @@ namespace OpenSim.Region.Framework.Scenes
List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>(); List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
// Start with true for both, then remove the flags if objects
// that we can't derez are part of the selection
bool permissionToTake = true;
bool permissionToTakeCopy = true;
bool permissionToDelete = true;
foreach (uint localID in localIDs) foreach (uint localID in localIDs)
{ {
// Start with true for both, then remove the flags if objects
// that we can't derez are part of the selection
bool permissionToTake = true;
bool permissionToTakeCopy = true;
bool permissionToDelete = true;
// Invalid id // Invalid id
SceneObjectPart part = GetSceneObjectPart(localID); SceneObjectPart part = GetSceneObjectPart(localID);
if (part == null) if (part == null)
@ -1803,16 +1803,16 @@ namespace OpenSim.Region.Framework.Scenes
permissionToTake = true; permissionToTake = true;
permissionToDelete = true; permissionToDelete = true;
} }
}
if (permissionToTake && (!permissionToDelete)) if (permissionToTake && (!permissionToDelete))
takeGroups.Add(grp); takeGroups.Add(grp);
if (permissionToDelete) if (permissionToDelete)
{ {
if (permissionToTake) if (permissionToTake)
deleteGroups.Add(grp); deleteGroups.Add(grp);
deleteIDs.Add(grp.LocalId); deleteIDs.Add(grp.LocalId);
}
} }
} }