Merge branch 'master' into careminster

6 files changed, 3 insertions, 13 deletions

diff --git a/OpenSim/Framework/IProfileModule.cs b/OpenSim/Region/Framework/Interfaces/IProfileModule.cs
index ef03d4a..ef03d4a 100644
--- a/OpenSim/Framework/IProfileModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IProfileModule.cs
diff --git a/OpenSim/Framework/ISearchModule.cs b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
index 64bf72c..64bf72c 100644
--- a/OpenSim/Framework/ISearchModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 44b0b88..78c3fa0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2086,16 +2086,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return retVal;
         }
 
-        public LSL_Key osNpcCreateOwned(string firstname, string lastname, LSL_Vector position, string notecard)
-        {
-            CheckThreatLevel(ThreatLevel.High, "osNpcCreateOwned");
-            return NpcCreate(firstname, lastname, position, notecard, true);
-        }
-
         public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
         {
             CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
-            return NpcCreate(firstname, lastname, position, notecard, false);
+            return NpcCreate(firstname, lastname, position, notecard, true);
         }
 
         public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 25f359a..403e491 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -173,7 +173,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         key osNpcCreate(string user, string name, vector position, string notecard);
         key osNpcCreate(string user, string name, vector position, string notecard, int options);
-        key osNpcCreateOwned(string user, string name, vector position, string notecard);
         LSL_Key osNpcSaveAppearance(key npc, string notecard);
         void osNpcLoadAppearance(key npc, string notecard);
         vector osNpcGetPos(key npc);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index ceccceb..0c05ea4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -493,11 +493,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom, options);
         }
 
-        public key osNpcCreateOwned(string user, string name, vector position, key cloneFrom)
-        {
-            return m_OSSL_Functions.osNpcCreateOwned(user, name, position, cloneFrom);
-        }
-
         public key osNpcSaveAppearance(key npc, string notecard)
         {
             return m_OSSL_Functions.osNpcSaveAppearance(npc, notecard);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index f0b28b2..9d9fc51 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -127,6 +127,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             npc = m_scene.GetScenePresence(npcId);
 
+            // Now the owner deleted it and it's gone
+            Assert.That(npc, Is.Null);
         }
 
         /// <summary>