diff options
author | Diva Canto | 2009-08-20 22:37:06 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-20 22:37:06 -0700 |
commit | 31e7e1b5f9eba9cca5792a29082d3eac27b9b3e9 (patch) | |
tree | 943cdae3b4de1462a9046316f5a0561e3ba3a9a8 /OpenSim/Region/ScriptEngine/Shared | |
parent | Made HandleFetchInventoryDescendents async, so that the client thread doesn't... (diff) | |
parent | * oops. Mistake with value return. (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
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; | |||
31 | using System.Runtime.Remoting.Lifetime; | 31 | using System.Runtime.Remoting.Lifetime; |
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Net; | 33 | using System.Net; |
34 | using System.Threading; | ||
34 | using OpenMetaverse; | 35 | using OpenMetaverse; |
35 | using Nini.Config; | 36 | using Nini.Config; |
36 | using OpenSim; | 37 | using 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) |