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

tidy up some OSSL NPC parameter names

bulletsim
Justin Clark-Casey (justincc) 2011-08-12 02:46:44 +01:00
parent 16ac5413dd
commit 76e0afe83f
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2127,7 +2127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return retVal; return retVal;
} }
public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, LSL_Key cloneFrom) public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
{ {
CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
@ -2136,17 +2136,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
AvatarAppearance appearance = null; AvatarAppearance appearance = null;
UUID cloneId; UUID id;
if (UUID.TryParse(cloneFrom, out cloneId)) if (UUID.TryParse(notecard, out id))
{ {
ScenePresence clonePresence = World.GetScenePresence(new UUID(cloneFrom.m_string)); ScenePresence clonePresence = World.GetScenePresence(id);
if (clonePresence != null) if (clonePresence != null)
appearance = clonePresence.Appearance; appearance = clonePresence.Appearance;
} }
if (appearance == null) if (appearance == null)
{ {
string appearanceSerialized = LoadNotecard(cloneFrom.m_string); string appearanceSerialized = LoadNotecard(notecard);
if (appearanceSerialized != null) if (appearanceSerialized != null)
{ {
@ -2175,9 +2175,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// Save the current appearance of the NPC permanently to the named notecard. /// Save the current appearance of the NPC permanently to the named notecard.
/// </summary> /// </summary>
/// <param name="avatar"></param> /// <param name="avatar"></param>
/// <param name="notecardName">The name of the notecard to which to save the appearance.</param> /// <param name="notecard">The name of the notecard to which to save the appearance.</param>
/// <returns>The asset ID of the notecard saved.</returns> /// <returns>The asset ID of the notecard saved.</returns>
public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecardName) public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecard)
{ {
CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance"); CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance");
@ -2192,13 +2192,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene)) if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
return new LSL_Key(UUID.Zero.ToString()); return new LSL_Key(UUID.Zero.ToString());
return SaveAppearanceToNotecard(npcId, notecardName); return SaveAppearanceToNotecard(npcId, notecard);
} }
return new LSL_Key(UUID.Zero.ToString()); return new LSL_Key(UUID.Zero.ToString());
} }
public void osNpcLoadAppearance(LSL_Key npc, string notecardNameOrUuid) public void osNpcLoadAppearance(LSL_Key npc, string notecard)
{ {
CheckThreatLevel(ThreatLevel.High, "osNpcLoadAppearance"); CheckThreatLevel(ThreatLevel.High, "osNpcLoadAppearance");
@ -2210,7 +2210,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(npc.m_string, out npcId)) if (!UUID.TryParse(npc.m_string, out npcId))
return; return;
string appearanceSerialized = LoadNotecard(notecardNameOrUuid); string appearanceSerialized = LoadNotecard(notecard);
OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized); OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
// OSD a = OSDParser.DeserializeLLSDXml(appearanceSerialized); // OSD a = OSDParser.DeserializeLLSDXml(appearanceSerialized);
// Console.WriteLine("appearanceSerialized {0}", appearanceSerialized); // Console.WriteLine("appearanceSerialized {0}", appearanceSerialized);
@ -2356,23 +2356,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// <summary> /// <summary>
/// Save the current appearance of the script owner permanently to the named notecard. /// Save the current appearance of the script owner permanently to the named notecard.
/// </summary> /// </summary>
/// <param name="notecardName">The name of the notecard to which to save the appearance.</param> /// <param name="notecard">The name of the notecard to which to save the appearance.</param>
/// <returns>The asset ID of the notecard saved.</returns> /// <returns>The asset ID of the notecard saved.</returns>
public LSL_Key osOwnerSaveAppearance(string notecardName) public LSL_Key osOwnerSaveAppearance(string notecard)
{ {
CheckThreatLevel(ThreatLevel.High, "osOwnerSaveAppearance"); CheckThreatLevel(ThreatLevel.High, "osOwnerSaveAppearance");
return SaveAppearanceToNotecard(m_host.OwnerID, notecardName); return SaveAppearanceToNotecard(m_host.OwnerID, notecard);
} }
public LSL_Key osAgentSaveAppearance(LSL_Key avatarId, string notecardName) public LSL_Key osAgentSaveAppearance(LSL_Key avatarId, string notecard)
{ {
CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance"); CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance");
return SaveAppearanceToNotecard(avatarId, notecardName); return SaveAppearanceToNotecard(avatarId, notecard);
} }
protected LSL_Key SaveAppearanceToNotecard(ScenePresence sp, string notecardName) protected LSL_Key SaveAppearanceToNotecard(ScenePresence sp, string notecard)
{ {
IAvatarFactory appearanceModule = World.RequestModuleInterface<IAvatarFactory>(); IAvatarFactory appearanceModule = World.RequestModuleInterface<IAvatarFactory>();
@ -2382,7 +2382,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSDMap appearancePacked = sp.Appearance.Pack(); OSDMap appearancePacked = sp.Appearance.Pack();
TaskInventoryItem item TaskInventoryItem item
= SaveNotecard(notecardName, "Avatar Appearance", Util.GetFormattedXml(appearancePacked as OSD), true); = SaveNotecard(notecard, "Avatar Appearance", Util.GetFormattedXml(appearancePacked as OSD), true);
return new LSL_Key(item.AssetID.ToString()); return new LSL_Key(item.AssetID.ToString());
} }
@ -2392,23 +2392,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
protected LSL_Key SaveAppearanceToNotecard(UUID avatarId, string notecardName) protected LSL_Key SaveAppearanceToNotecard(UUID avatarId, string notecard)
{ {
ScenePresence sp = World.GetScenePresence(avatarId); ScenePresence sp = World.GetScenePresence(avatarId);
if (sp == null || sp.IsChildAgent) if (sp == null || sp.IsChildAgent)
return new LSL_Key(UUID.Zero.ToString()); return new LSL_Key(UUID.Zero.ToString());
return SaveAppearanceToNotecard(sp, notecardName); return SaveAppearanceToNotecard(sp, notecard);
} }
protected LSL_Key SaveAppearanceToNotecard(LSL_Key rawAvatarId, string notecardName) protected LSL_Key SaveAppearanceToNotecard(LSL_Key rawAvatarId, string notecard)
{ {
UUID avatarId; UUID avatarId;
if (!UUID.TryParse(rawAvatarId, out avatarId)) if (!UUID.TryParse(rawAvatarId, out avatarId))
return new LSL_Key(UUID.Zero.ToString()); return new LSL_Key(UUID.Zero.ToString());
return SaveAppearanceToNotecard(avatarId, notecardName); return SaveAppearanceToNotecard(avatarId, notecard);
} }
/// <summary> /// <summary>

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

@ -168,9 +168,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules); LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
key osNpcCreate(string user, string name, vector position, key cloneFrom); key osNpcCreate(string user, string name, vector position, string notecard);
LSL_Key osNpcSaveAppearance(key npc, string notecardName); LSL_Key osNpcSaveAppearance(key npc, string notecard);
void osNpcLoadAppearance(key npc, string notecardNameOrUuid); void osNpcLoadAppearance(key npc, string notecard);
vector osNpcGetPos(key npc); vector osNpcGetPos(key npc);
void osNpcMoveTo(key npc, vector position); void osNpcMoveTo(key npc, vector position);
void osNpcMoveToTarget(key npc, vector target, int options); void osNpcMoveToTarget(key npc, vector target, int options);
@ -180,8 +180,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osNpcSay(key npc, string message); void osNpcSay(key npc, string message);
void osNpcRemove(key npc); void osNpcRemove(key npc);
LSL_Key osOwnerSaveAppearance(string notecardName); LSL_Key osOwnerSaveAppearance(string notecard);
LSL_Key osAgentSaveAppearance(key agentId, string notecardName); LSL_Key osAgentSaveAppearance(key agentId, string notecard);
key osGetMapTexture(); key osGetMapTexture();
key osGetRegionMapTexture(string regionName); key osGetRegionMapTexture(string regionName);

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

@ -483,14 +483,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom); return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom);
} }
public key osNpcSaveAppearance(key npc, string notecardName) public key osNpcSaveAppearance(key npc, string notecard)
{ {
return m_OSSL_Functions.osNpcSaveAppearance(npc, notecardName); return m_OSSL_Functions.osNpcSaveAppearance(npc, notecard);
} }
public void osNpcLoadAppearance(key npc, string notecardNameOrUuid) public void osNpcLoadAppearance(key npc, string notecard)
{ {
m_OSSL_Functions.osNpcLoadAppearance(npc, notecardNameOrUuid); m_OSSL_Functions.osNpcLoadAppearance(npc, notecard);
} }
public vector osNpcGetPos(LSL_Key npc) public vector osNpcGetPos(LSL_Key npc)
@ -533,14 +533,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcRemove(npc); m_OSSL_Functions.osNpcRemove(npc);
} }
public LSL_Key osOwnerSaveAppearance(string notecardName) public LSL_Key osOwnerSaveAppearance(string notecard)
{ {
return m_OSSL_Functions.osOwnerSaveAppearance(notecardName); return m_OSSL_Functions.osOwnerSaveAppearance(notecard);
} }
public LSL_Key osAgentSaveAppearance(LSL_Key agentId, string notecardName) public LSL_Key osAgentSaveAppearance(LSL_Key agentId, string notecard)
{ {
return m_OSSL_Functions.osAgentSaveAppearance(agentId, notecardName); return m_OSSL_Functions.osAgentSaveAppearance(agentId, notecard);
} }
public OSSLPrim Prim; public OSSLPrim Prim;