From 62b851b02fc3305e5399e51286d42cab1c6c681e Mon Sep 17 00:00:00 2001
From: Christopher <christopher.latza@gmail.com>
Date: Fri, 21 Aug 2015 02:45:22 +0200
Subject: [PATCH] llhttprequest use now the usermanagement to get the owner
 name

---
 .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2996e39..07efd80 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12766,12 +12766,16 @@ flag > (int)HttpRequestConstants.HTTP_PRAGMA_NO_CACHE)
             Vector3 position = m_host.AbsolutePosition;
             Vector3 velocity = m_host.Velocity;
             Quaternion rotation = m_host.RotationOffset;
-            string ownerName = String.Empty;
-            ScenePresence scenePresence = World.GetScenePresence(m_host.OwnerID);
-            if (scenePresence == null)
-                ownerName = resolveName(m_host.OwnerID);
+            string ownerName;
+
+            if (m_ScriptEngine.World.UserManagementModule != null)
+            {
+                ownerName = m_ScriptEngine.World.UserManagementModule.GetUserName(m_host.OwnerID);
+            }
             else
-                ownerName = scenePresence.Name;
+            {
+                ownerName = "Unknown User";
+            }
 
             RegionInfo regionInfo = World.RegionInfo;
 

From 56f15201fb9a6963d4088504f30d8ae253d28f6f Mon Sep 17 00:00:00 2001
From: Christopher <christopher.latza@gmail.com>
Date: Fri, 21 Aug 2015 02:46:19 +0200
Subject: [PATCH] llrequestpermissions use now the usermanagement to get the
 owner name

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 07efd80..3cdc1e8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3890,9 +3890,15 @@ public void llRequestPermissions(string agent, int perm)
                     return;
                 }
 
-                string ownerName = resolveName(m_host.ParentGroup.RootPart.OwnerID);
-                if (ownerName == String.Empty)
-                    ownerName = "(hippos)";
+                string ownerName;
+                if (m_ScriptEngine.World.UserManagementModule != null)
+                {
+                    ownerName = m_ScriptEngine.World.UserManagementModule.GetUserName(m_host.OwnerID);
+                }
+                else
+                {
+                    ownerName = "Unknown User";
+                }
 
                 if (!m_waitingForScriptAnswer)
                 {

From 3d5dc0a0f09749b72de34480d3632ca19c67b29e Mon Sep 17 00:00:00 2001
From: Christopher <christopher.latza@gmail.com>
Date: Fri, 21 Aug 2015 02:47:52 +0200
Subject: [PATCH] remove unneeded function resolveName(UUID objecUUID)

---
 .../Shared/Api/Implementation/LSL_Api.cs           | 35 ----------------------
 1 file changed, 35 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3cdc1e8..76272db 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1211,41 +1211,6 @@ public void llSensorRemove()
             AsyncCommands.SensorRepeatPlugin.UnSetSenseRepeaterEvents(m_host.LocalId, m_item.ItemID);
         }
 
-        public string resolveName(UUID objecUUID)
-        {
-            // try avatar username surname
-            UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, objecUUID);
-            if (account != null)
-            {
-                string avatarname = account.Name;
-                return avatarname;
-            }
-            // try an scene object
-            SceneObjectPart SOP = World.GetSceneObjectPart(objecUUID);
-            if (SOP != null)
-            {
-                string objectname = SOP.Name;
-                return objectname;
-            }
-
-            EntityBase SensedObject;
-            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;
-        }
-
         public LSL_String llDetectedName(int number)
         {
             m_host.AddScriptLPS(1);