OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-01-13 02:27:20 +00:00
parent c7757d1038 acbff305f5
commit 9dc7fef4f6
6 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
OpenSim/Framework/IProfileModule.cs → OpenSim/Region/Framework/Interfaces/IProfileModule.cs
View File

0
OpenSim/Framework/ISearchModule.cs → OpenSim/Region/Framework/Interfaces/ISearchModule.cs
View File

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -2086,16 +2086,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return retVal; 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) public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
{ {
CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); 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) public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -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);
key osNpcCreate(string user, string name, vector position, string notecard, int options); 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); LSL_Key osNpcSaveAppearance(key npc, string notecard);
void osNpcLoadAppearance(key npc, string notecard); void osNpcLoadAppearance(key npc, string notecard);
vector osNpcGetPos(key npc); vector osNpcGetPos(key npc);

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -493,11 +493,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom, options); 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) public key osNpcSaveAppearance(key npc, string notecard)
{ {
return m_OSSL_Functions.osNpcSaveAppearance(npc, notecard); return m_OSSL_Functions.osNpcSaveAppearance(npc, notecard);

2
OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
View File

@ -127,6 +127,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
npc = m_scene.GetScenePresence(npcId); npc = m_scene.GetScenePresence(npcId);
// Now the owner deleted it and it's gone
Assert.That(npc, Is.Null);
} }
/// <summary> /// <summary>