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 httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-10-13 20:36:29 +01:00
parent b1814d3492 b51b4d4171
commit 68e9baf2e0
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
View File

@@ -803,12 +803,15 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
else
so = m_scene.GetSceneObjectGroup(localId);
if (so!= null && !so.IsAttachment)
deletes.Add(so);
// if (deletes.Count == 0)
// m_console.OutputFormat("No objects were found with uuid {0}", match);
if (so!= null)
{
deletes.Add(so);
if(so.IsAttachment)
{
requireConfirmation = true;
m_console.OutputFormat("Warning: object with uuid {0} is a attachment", uuid);
}
}
break;
case "name":
@@ -904,11 +907,11 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
if (useRegex)
{
Regex nameRegex = new Regex(name);
searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
searchAction = so => { if (nameRegex.IsMatch(so.Name)) {if(!so.IsAttachment) sceneObjects.Add(so);}};
}
else
{
searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
searchAction = so => { if (so.Name == name) {if(!so.IsAttachment) sceneObjects.Add(so);}};
}
m_scene.ForEachSOG(searchAction);