aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2012-01-07 02:49:52 +0100
committerMelanie2012-01-07 02:49:52 +0100
commit38ae4792494f6de71fbd3876f0c2449e7c49e4cc (patch)
tree4c098422426e681f00bb035d408cb49ea0b8ef26 /OpenSim/Region/ScriptEngine/Shared
parentFix some syntax issues (diff)
downloadopensim-SC-38ae4792494f6de71fbd3876f0c2449e7c49e4cc.zip
opensim-SC-38ae4792494f6de71fbd3876f0c2449e7c49e4cc.tar.gz
opensim-SC-38ae4792494f6de71fbd3876f0c2449e7c49e4cc.tar.bz2
opensim-SC-38ae4792494f6de71fbd3876f0c2449e7c49e4cc.tar.xz
Make sure to prefix NPC names with "NPC:" so they can't be mistaken for users
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 6530f14..86bfbf0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2100,6 +2100,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2100 2100
2101 private LSL_Key NpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, bool owned) 2101 private LSL_Key NpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, bool owned)
2102 { 2102 {
2103 if (firstname != String.Empty || lastname != String.Empty)
2104 {
2105 if (firstname != "Shown outfit:")
2106 firstname = "NPC: " + firstname;
2107 }
2108
2103 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2109 INPCModule module = World.RequestModuleInterface<INPCModule>();
2104 if (module != null) 2110 if (module != null)
2105 { 2111 {