diff options
author | Justin Clark-Casey (justincc) | 2009-10-14 19:44:19 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-10-14 19:44:19 +0100 |
commit | c58713a3a5a2331d1869469ecf6929c28af1c16a (patch) | |
tree | f9f83e76caa9e9178e4377d6e0716c3b3cd04ee6 /OpenSim/Region/ScriptEngine | |
parent | * minor: remove some mono compiler warnings (diff) | |
parent | Setting changeY in border crossing. (diff) | |
download | opensim-SC-c58713a3a5a2331d1869469ecf6929c28af1c16a.zip opensim-SC-c58713a3a5a2331d1869469ecf6929c28af1c16a.tar.gz opensim-SC-c58713a3a5a2331d1869469ecf6929c28af1c16a.tar.bz2 opensim-SC-c58713a3a5a2331d1869469ecf6929c28af1c16a.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 b5f6721..e10e612 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -859,7 +859,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
859 | World.Entities.TryGetValue(objecUUID, out SensedObject); | 859 | World.Entities.TryGetValue(objecUUID, out SensedObject); |
860 | 860 | ||
861 | if (SensedObject == null) | 861 | if (SensedObject == null) |
862 | { | ||
863 | IGroupsModule groups = World.RequestModuleInterface<IGroupsModule>(); | ||
864 | if (groups != null) | ||
865 | { | ||
866 | GroupRecord gr = groups.GetGroupRecord(objecUUID); | ||
867 | if (gr != null) | ||
868 | return gr.GroupName; | ||
869 | } | ||
862 | return String.Empty; | 870 | return String.Empty; |
871 | } | ||
872 | |||
863 | return SensedObject.Name; | 873 | return SensedObject.Name; |
864 | } | 874 | } |
865 | 875 | ||