aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorUbitUmarov2016-12-07 20:34:11 +0000
committerUbitUmarov2016-12-07 20:34:11 +0000
commit55c04a24101792ac5060a2fa12c5cccf1fe392fb (patch)
treeec53ac0c8b6314c2049df2e7767ee08c581374f6 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentchange a few ssl config comments (diff)
parentadd missing sp Intransit control (diff)
downloadopensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.zip
opensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.tar.gz
opensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.tar.bz2
opensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs19
1 files changed, 19 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 19f2d09..b101cf9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2999,6 +2999,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2999 } 2999 }
3000 } 3000 }
3001 3001
3002 public void osNpcSetProfileAbout(LSL_Key npc, string about)
3003 {
3004 CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
3005 m_host.AddScriptLPS(1);
3006
3007 INPCModule module = World.RequestModuleInterface<INPCModule>();
3008 if (module != null)
3009 {
3010 UUID npcId = new UUID(npc.m_string);
3011
3012 if (!module.CheckPermissions(npcId, m_host.OwnerID))
3013 return;
3014
3015 ScenePresence sp = World.GetScenePresence(npcId);
3016 if (sp != null)
3017 ((INPC)(sp.ControllingClient)).profileAbout = about;
3018 }
3019 }
3020
3002 public void osNpcSay(LSL_Key npc, string message) 3021 public void osNpcSay(LSL_Key npc, string message)
3003 { 3022 {
3004 osNpcSay(npc, 0, message); 3023 osNpcSay(npc, 0, message);