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

Merge branch 'master' into htb-throttle

prioritization
Melanie 2009-10-14 23:31:38 +01:00
parent 82012ec4e3 c58713a3a5
commit 6bdd6ae0a0
5 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1796,6 +1796,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;
} }

2
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
View File

@ -298,7 +298,7 @@ namespace OpenSim.Services.Connectors
return; return;
} }
AssetBase asset = asset = m_Cache.Get(assetID.ToString()); AssetBase asset = m_Cache.Get(assetID.ToString());
if (asset == null) if (asset == null)
{ {

6
OpenSim/Services/Connectors/User/UserServiceConnector.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors
LogManager.GetLogger( LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); MethodBase.GetCurrentMethod().DeclaringType);
private string m_ServerURI = String.Empty; // private string m_ServerURI = String.Empty;
public UserServicesConnector() public UserServicesConnector()
{ {
@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors
public UserServicesConnector(string serverURI) public UserServicesConnector(string serverURI)
{ {
m_ServerURI = serverURI.TrimEnd('/'); // m_ServerURI = serverURI.TrimEnd('/');
} }
public UserServicesConnector(IConfigSource source) public UserServicesConnector(IConfigSource source)
@ -78,7 +78,7 @@ namespace OpenSim.Services.Connectors
m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService"); m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService");
throw new Exception("User connector init error"); throw new Exception("User connector init error");
} }
m_ServerURI = serviceURI; //m_ServerURI = serviceURI;
} }
public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)

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>