aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-06-10 22:41:39 +0000
committerCharles Krinke2008-06-10 22:41:39 +0000
commit9b43668bf39bf37120814f7d340f47c2c4caf94f (patch)
treedd14b9baf087ff489c6b24283e8f160dd79ba7fa
parent* Add memory currently allocated to OpenSim to 'show stats' statistics (diff)
downloadopensim-SC-9b43668bf39bf37120814f7d340f47c2c4caf94f.zip
opensim-SC-9b43668bf39bf37120814f7d340f47c2c4caf94f.tar.gz
opensim-SC-9b43668bf39bf37120814f7d340f47c2c4caf94f.tar.bz2
opensim-SC-9b43668bf39bf37120814f7d340f47c2c4caf94f.tar.xz
Mantis#1529. Thank you kindly, Grumly57 for a patch to
xengine to: Replaces "presence.Name" => "presence.ControllingClient.Name" to return avatar's name.
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs3
2 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 3d32511..21a3540 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -56,6 +56,7 @@ Patches
56* Xantor 56* Xantor
57* YZh 57* YZh
58* Dahlia 58* Dahlia
59* Grumly57
59 60
60 61
61LSL Devs 62LSL Devs
diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
index fce00e8..04cb0b2 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
3769 3769
3770 if (presence != null) 3770 if (presence != null)
3771 { 3771 {
3772 return presence.Name; 3772 return presence.ControllingClient.Name;
3773 //return presence.Name;
3773 } 3774 }
3774 3775
3775 if (World.GetSceneObjectPart(key) != null) 3776 if (World.GetSceneObjectPart(key) != null)