aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorUbitUmarov2016-11-23 22:15:59 +0000
committerUbitUmarov2016-11-23 22:15:59 +0000
commit94ec5884b7d3cfe350725d5734d227fa1becee94 (patch)
tree08826e28fe099da1d1982c5af1e74f9051d7fc6d /OpenSim/Region/ScriptEngine
parent it is nice to save a file to atually change it... (diff)
downloadopensim-SC-94ec5884b7d3cfe350725d5734d227fa1becee94.zip
opensim-SC-94ec5884b7d3cfe350725d5734d227fa1becee94.tar.gz
opensim-SC-94ec5884b7d3cfe350725d5734d227fa1becee94.tar.bz2
opensim-SC-94ec5884b7d3cfe350725d5734d227fa1becee94.tar.xz
fix llRez(AtRoot/Object) error messages on shared code path
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index af04951..3db5dd2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3482,13 +3482,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3482 3482
3483 if (item == null) 3483 if (item == null)
3484 { 3484 {
3485 Error("llRezAtRoot", "Can't find object '" + inventory + "'"); 3485 Error("llRez(AtRoot/Object)", "Can't find object '" + inventory + "'");
3486 return; 3486 return;
3487 } 3487 }
3488 3488
3489 if (item.InvType != (int)InventoryType.Object) 3489 if (item.InvType != (int)InventoryType.Object)
3490 { 3490 {
3491 Error("llRezAtRoot", "Can't create requested object; object is missing from database"); 3491 Error("llRez(AtRoot/Object)", "Can't create requested object; object is missing from database");
3492 return; 3492 return;
3493 } 3493 }
3494 3494
@@ -3532,7 +3532,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3532 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay) 3532 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
3533 } 3533 }
3534 3534
3535 }, null, "LSL_Api.llRezAtRoot"); 3535 }, null, "LSL_Api.doObjectRez");
3536 3536
3537 //ScriptSleep((int)((groupmass * velmag) / 10)); 3537 //ScriptSleep((int)((groupmass * velmag) / 10));
3538 ScriptSleep(m_sleepMsOnRezAtRoot); 3538 ScriptSleep(m_sleepMsOnRezAtRoot);