diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9f147618d3..14e4534d97 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1796,6 +1796,7 @@ namespace OpenSim.Region.Framework.Scenes if (crossedBordery.BorderLine.Z > 0) { pos.Y = ((pos.Y + crossedBordery.BorderLine.Z)); + changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize); } else pos.Y = ((pos.Y + Constants.RegionSize)); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index b5f6721675..e10e612296 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 World.Entities.TryGetValue(objecUUID, out SensedObject); if (SensedObject == null) + { + IGroupsModule groups = World.RequestModuleInterface(); + if (groups != null) + { + GroupRecord gr = groups.GetGroupRecord(objecUUID); + if (gr != null) + return gr.GroupName; + } return String.Empty; + } + return SensedObject.Name; } diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 6f7c90faa9..ecda85a9e3 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs @@ -298,7 +298,7 @@ namespace OpenSim.Services.Connectors return; } - AssetBase asset = asset = m_Cache.Get(assetID.ToString()); + AssetBase asset = m_Cache.Get(assetID.ToString()); if (asset == null) { diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs index d4189380d6..683990f826 100644 --- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs +++ b/OpenSim/Services/Connectors/User/UserServiceConnector.cs @@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors LogManager.GetLogger( MethodBase.GetCurrentMethod().DeclaringType); - private string m_ServerURI = String.Empty; +// private string m_ServerURI = String.Empty; public UserServicesConnector() { @@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors public UserServicesConnector(string serverURI) { - m_ServerURI = serverURI.TrimEnd('/'); +// m_ServerURI = serverURI.TrimEnd('/'); } public UserServicesConnector(IConfigSource source) @@ -78,7 +78,7 @@ namespace OpenSim.Services.Connectors m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService"); throw new Exception("User connector init error"); } - m_ServerURI = serviceURI; + //m_ServerURI = serviceURI; } public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) 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 a3f681d89e..0000000000 --- a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config +++ /dev/null @@ -1,33 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -