aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-20 22:37:06 -0700
committerDiva Canto2009-08-20 22:37:06 -0700
commit31e7e1b5f9eba9cca5792a29082d3eac27b9b3e9 (patch)
tree943cdae3b4de1462a9046316f5a0561e3ba3a9a8 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentMade HandleFetchInventoryDescendents async, so that the client thread doesn't... (diff)
parent* oops. Mistake with value return. (diff)
downloadopensim-SC_OLD-31e7e1b5f9eba9cca5792a29082d3eac27b9b3e9.zip
opensim-SC_OLD-31e7e1b5f9eba9cca5792a29082d3eac27b9b3e9.tar.gz
opensim-SC_OLD-31e7e1b5f9eba9cca5792a29082d3eac27b9b3e9.tar.bz2
opensim-SC_OLD-31e7e1b5f9eba9cca5792a29082d3eac27b9b3e9.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
1 files changed, 2 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 fcfa9fc..6190349 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
31using System.Runtime.Remoting.Lifetime; 31using System.Runtime.Remoting.Lifetime;
32using System.Text; 32using System.Text;
33using System.Net; 33using System.Net;
34using System.Threading;
34using OpenMetaverse; 35using OpenMetaverse;
35using Nini.Config; 36using Nini.Config;
36using OpenSim; 37using OpenSim;
@@ -1766,6 +1767,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1766 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, LSL_Key cloneFrom) 1767 public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, LSL_Key cloneFrom)
1767 { 1768 {
1768 CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); 1769 CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
1770 //QueueUserWorkItem
1769 1771
1770 INPCModule module = World.RequestModuleInterface<INPCModule>(); 1772 INPCModule module = World.RequestModuleInterface<INPCModule>();
1771 if (module != null) 1773 if (module != null)