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

XmlRpcGroup: minor change

master
UbitUmarov 2020-06-09 00:53:03 +01:00
parent 9c55c5bdb2
commit 351235f78e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -39,7 +39,6 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using System.Text; using System.Text;
using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
using PermissionMask = OpenSim.Framework.PermissionMask; using PermissionMask = OpenSim.Framework.PermissionMask;
namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
@ -695,13 +694,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (noticeID == UUID.Zero) if (noticeID == UUID.Zero)
return; return;
InventoryFolderBase trash = scene.InventoryService.GetFolderForType(remoteAgentID, FolderType.Trash);
if(trash == null)
{
m_log.DebugFormat("[xmlGROUPS]: failed to find trash folder for {0} ", remoteAgentID);
return;
}
GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteAgentID, noticeID); GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteAgentID, noticeID);
if (notice == null) if (notice == null)
{ {
@ -735,6 +727,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (itemCopy == null) if (itemCopy == null)
return; return;
InventoryFolderBase trash = scene.InventoryService.GetFolderForType(remoteAgentID, FolderType.Trash);
if (trash == null)
{
m_log.DebugFormat("[xmlGROUPS]: failed to find trash folder for {0} ", remoteAgentID);
return;
}
if (itemCopy.Folder == trash.ID || remoteAgentID == giver) if (itemCopy.Folder == trash.ID || remoteAgentID == giver)
return; return;