Merge branch 'master' into vehicles

This commit is contained in:
Melanie
2009-10-15 21:14:13 +01:00
63 changed files with 2254 additions and 1996 deletions

View File

@@ -863,7 +863,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.Entities.TryGetValue(objecUUID, out SensedObject);
if (SensedObject == null)
{
IGroupsModule groups = World.RequestModuleInterface<IGroupsModule>();
if (groups != null)
{
GroupRecord gr = groups.GetGroupRecord(objecUUID);
if (gr != null)
return gr.GroupName;
}
return String.Empty;
}
return SensedObject.Name;
}