aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorCharles Krinke2008-06-04 14:47:12 +0000
committerCharles Krinke2008-06-04 14:47:12 +0000
commit994932bb6065c417a979a72bd98c7c72e5af9668 (patch)
treebe99f2331b32237cd58a06f6050e98da9574c838 /OpenSim/Region
parentMantis#1441. Thank you kindly, Kinoc for a patch that: (diff)
downloadopensim-SC-994932bb6065c417a979a72bd98c7c72e5af9668.zip
opensim-SC-994932bb6065c417a979a72bd98c7c72e5af9668.tar.gz
opensim-SC-994932bb6065c417a979a72bd98c7c72e5af9668.tar.bz2
opensim-SC-994932bb6065c417a979a72bd98c7c72e5af9668.tar.xz
Mantis#1447. Thank you kindly, Kinoc for a patch that:
llKey2Name fix to show avatar name instead of "Basic Entity" One line fix. Replaces "presence.Name" => "presence.ControllingClient.Name" to return avatar's name.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 6a3f464..663ac0c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3692,12 +3692,13 @@ namespace OpenSim.Region.ScriptEngine.Common
3692 if (LLUUID.TryParse(id,out key)) 3692 if (LLUUID.TryParse(id,out key))
3693 { 3693 {
3694 ScenePresence presence = World.GetScenePresence(key); 3694 ScenePresence presence = World.GetScenePresence(key);
3695 3695
3696 if (presence != null) 3696 if (presence != null)
3697 { 3697 {
3698 return presence.Name; 3698 return presence.ControllingClient.Name;
3699 //return presence.Name;
3699 } 3700 }
3700 3701
3701 if (World.GetSceneObjectPart(key) != null) 3702 if (World.GetSceneObjectPart(key) != null)
3702 { 3703 {
3703 return World.GetSceneObjectPart(key).Name; 3704 return World.GetSceneObjectPart(key).Name;