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

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2016-09-21 15:26:30 +01:00
parent 82997c5907 874ba6b363
commit db1e75b0ac
4 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@@ -701,6 +701,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
last = parts[1];
}
uui = userID + ";" + homeURL + ";" + first + " " + last;
return result;
}
}

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

@@ -768,7 +768,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
else
so = m_scene.GetSceneObjectGroup(localId);
if (!so.IsAttachment)
if (so!= null && !so.IsAttachment)
deletes.Add(so);
// if (deletes.Count == 0)