OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

prioritization
Justin Clark-Casey (justincc) 2009-10-14 19:44:19 +01:00
parent 0cb0a28fde bea13e3709
commit c58713a3a5
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1804,6 +1804,7 @@ namespace OpenSim.Region.Framework.Scenes
if (crossedBordery.BorderLine.Z > 0) if (crossedBordery.BorderLine.Z > 0)
{ {
pos.Y = ((pos.Y + crossedBordery.BorderLine.Z)); pos.Y = ((pos.Y + crossedBordery.BorderLine.Z));
changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize);
} }
else else
pos.Y = ((pos.Y + Constants.RegionSize)); pos.Y = ((pos.Y + Constants.RegionSize));

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -859,7 +859,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.Entities.TryGetValue(objecUUID, out SensedObject); World.Entities.TryGetValue(objecUUID, out SensedObject);
if (SensedObject == null) 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 String.Empty;
}
return SensedObject.Name; return SensedObject.Name;
} }

33
bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config
View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
<bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
<bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
<bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<log4net>
<!-- A1 is set to be a ConsoleAppender -->
<appender name="A1" type="log4net.Appender.ConsoleAppender">
<!-- A1 uses PatternLayout -->
<layout type="log4net.Layout.PatternLayout">
<!-- Print the date in ISO 8601 format -->
<conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
</layout>
</appender>
<!-- Set root logger level to DEBUG and its only appender to A1 -->
<root>
<level value="DEBUG" />
<appender-ref ref="A1" />
</root>
</log4net>
</configuration>