diff options
author | Melanie | 2009-10-14 17:39:38 +0100 |
---|---|---|
committer | Melanie | 2009-10-14 17:39:38 +0100 |
commit | 3795cface2c089c9148e727b086cb4cd554ff38e (patch) | |
tree | cbecce6ffb7b60722aa17d456059ddb9c20e819c | |
parent | Set the estate owner to be the master avatar if it's not set. (diff) | |
download | opensim-SC-3795cface2c089c9148e727b086cb4cd554ff38e.zip opensim-SC-3795cface2c089c9148e727b086cb4cd554ff38e.tar.gz opensim-SC-3795cface2c089c9148e727b086cb4cd554ff38e.tar.bz2 opensim-SC-3795cface2c089c9148e727b086cb4cd554ff38e.tar.xz |
Enable LSL dialogs to display group names properly
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 | ||||
-rw-r--r-- | bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config | 33 |
2 files changed, 10 insertions, 33 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 | ||
diff --git a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config b/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config deleted file mode 100644 index a3f681d..0000000 --- a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <configuration> | ||
3 | <configSections> | ||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
5 | </configSections> | ||
6 | <runtime> | ||
7 | <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
8 | <dependentAssembly> | ||
9 | <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" /> | ||
10 | <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" /> | ||
11 | <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" /> | ||
12 | <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" /> | ||
13 | </dependentAssembly> | ||
14 | </assemblyBinding> | ||
15 | </runtime> | ||
16 | <log4net> | ||
17 | <!-- A1 is set to be a ConsoleAppender --> | ||
18 | <appender name="A1" type="log4net.Appender.ConsoleAppender"> | ||
19 | |||
20 | <!-- A1 uses PatternLayout --> | ||
21 | <layout type="log4net.Layout.PatternLayout"> | ||
22 | <!-- Print the date in ISO 8601 format --> | ||
23 | <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" /> | ||
24 | </layout> | ||
25 | </appender> | ||
26 | |||
27 | <!-- Set root logger level to DEBUG and its only appender to A1 --> | ||
28 | <root> | ||
29 | <level value="DEBUG" /> | ||
30 | <appender-ref ref="A1" /> | ||
31 | </root> | ||
32 | </log4net> | ||
33 | </configuration> | ||