From 9b43668bf39bf37120814f7d340f47c2c4caf94f Mon Sep 17 00:00:00 2001
From: Charles Krinke <cfk@pacbell.net>
Date: Tue, 10 Jun 2008 22:41:39 +0000
Subject: [PATCH] Mantis#1529. Thank you kindly, Grumly57 for a patch to
 xengine to: Replaces "presence.Name" => "presence.ControllingClient.Name" to
 return avatar's name.

---
 CONTRIBUTORS.txt                                          | 1 +
 OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 3d32511560..21a3540a66 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -56,6 +56,7 @@ Patches
 * Xantor
 * YZh
 * Dahlia
+* Grumly57
 
 
 LSL Devs
diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
index fce00e82f0..04cb0b2f4b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
@@ -3769,7 +3769,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                 if (presence != null)
                 {
-                    return presence.Name;
+                    return presence.ControllingClient.Name;
+                    //return presence.Name;
                 }
 
                 if (World.GetSceneObjectPart(key) != null)