From 3795cface2c089c9148e727b086cb4cd554ff38e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 14 Oct 2009 17:39:38 +0100
Subject: Enable LSL dialogs to display group names properly

---
 .../Shared/Api/Implementation/LSL_Api.cs           | 10 +++++++
 ...m.Region.ClientStack.LindenUDP.Tests.dll.config | 33 ----------------------
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config

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
             World.Entities.TryGetValue(objecUUID, out SensedObject);
 
             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 SensedObject.Name;
         }
 
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 @@
-<?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>
-- 
cgit v1.1


From bea13e37090bd2daa44c2202634c8e2fa81c203b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 14 Oct 2009 11:01:46 -0700
Subject: Setting changeY in border crossing.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0f351ce..04eb93f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1804,6 +1804,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));
-- 
cgit v1.1


From 0cb0a28fde4c1d870c157bd19675a0653b06bc80 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Oct 2009 19:43:56 +0100
Subject: * minor: remove some mono compiler warnings

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 2 +-
 OpenSim/Services/Connectors/User/UserServiceConnector.cs   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 6f7c90f..ecda85a 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 d418938..683990f 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)
-- 
cgit v1.1