aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-09-22 22:08:21 +0100
committerUbitUmarov2016-09-22 22:08:21 +0100
commit720135207405be15b94a006de155353259a64944 (patch)
treec4182d0256618fbdbd7270e0d0e789cbe95a6549 /OpenSim
parentno need to send wind on avatar arrival when it is sent periodicly (diff)
downloadopensim-SC_OLD-720135207405be15b94a006de155353259a64944.zip
opensim-SC_OLD-720135207405be15b94a006de155353259a64944.tar.gz
opensim-SC_OLD-720135207405be15b94a006de155353259a64944.tar.bz2
opensim-SC_OLD-720135207405be15b94a006de155353259a64944.tar.xz
bug fix: add a missing return; add some error messages
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index abb7d70..57bff6e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2664,13 +2664,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2664 private LSL_Key NpcCreate( 2664 private LSL_Key NpcCreate(
2665 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent, bool hostGroupID) 2665 string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent, bool hostGroupID)
2666 { 2666 {
2667
2668 if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z))) 2667 if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
2668 {
2669 OSSLError("no permission to rez NPC at requested location");
2669 return new LSL_Key(UUID.Zero.ToString()); 2670 return new LSL_Key(UUID.Zero.ToString());
2671 }
2670 2672
2671 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2673 INPCModule module = World.RequestModuleInterface<INPCModule>();
2672 if(module == null) 2674 if(module == null)
2673 new LSL_Key(UUID.Zero.ToString()); 2675 {
2676 OSSLError("NPC module not enabled");
2677 return new LSL_Key(UUID.Zero.ToString());
2678 }
2674 2679
2675 string groupTitle = String.Empty; 2680 string groupTitle = String.Empty;
2676 UUID groupID = UUID.Zero; 2681 UUID groupID = UUID.Zero;