diff options
| author | Melanie | 2009-10-15 21:14:13 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-15 21:14:13 +0100 |
| commit | 6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch) | |
| tree | ffa84d5963afbb5390b132278c95df20b21681d5 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff) | |
| download | opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2 opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index b79c356..7c176bb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -863,7 +863,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 863 | World.Entities.TryGetValue(objecUUID, out SensedObject); | 863 | World.Entities.TryGetValue(objecUUID, out SensedObject); |
| 864 | 864 | ||
| 865 | if (SensedObject == null) | 865 | if (SensedObject == null) |
| 866 | { | ||
| 867 | IGroupsModule groups = World.RequestModuleInterface<IGroupsModule>(); | ||
| 868 | if (groups != null) | ||
| 869 | { | ||
| 870 | GroupRecord gr = groups.GetGroupRecord(objecUUID); | ||
| 871 | if (gr != null) | ||
| 872 | return gr.GroupName; | ||
| 873 | } | ||
| 866 | return String.Empty; | 874 | return String.Empty; |
| 875 | } | ||
| 876 | |||
| 867 | return SensedObject.Name; | 877 | return SensedObject.Name; |
| 868 | } | 878 | } |
| 869 | 879 | ||