From c6c91e6599de6d4402ec0258da03cc975147da90 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Aug 2011 00:13:08 +0100
Subject: refactor: Fold most SOP.ScriptSet* methods back into script code.
Simplify.
---
.../Shared/Api/Implementation/LSL_Api.cs | 27 ++++++----------------
1 file changed, 7 insertions(+), 20 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 26969a5..7c21ba9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1204,10 +1204,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if ((status & ScriptBaseClass.STATUS_PHANTOM) == ScriptBaseClass.STATUS_PHANTOM)
{
- if (value != 0)
- m_host.ScriptSetPhantomStatus(true);
- else
- m_host.ScriptSetPhantomStatus(false);
+ if (m_host.ParentGroup != null)
+ m_host.ParentGroup.ScriptSetPhantomStatus(value != 0);
}
if ((status & ScriptBaseClass.STATUS_CAST_SHADOWS) == ScriptBaseClass.STATUS_CAST_SHADOWS)
@@ -6446,9 +6444,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (m_host.ParentGroup != null)
{
if (!m_host.ParentGroup.IsDeleted)
- {
- m_host.ParentGroup.RootPart.ScriptSetVolumeDetect(detect!=0);
- }
+ m_host.ParentGroup.ScriptSetVolumeDetect(detect != 0);
}
}
@@ -6456,7 +6452,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// This is a depecated function so this just replicates the result of
/// invoking it in SL
///
-
public void llRemoteLoadScript(string target, string name, int running, int start_param)
{
m_host.AddScriptLPS(1);
@@ -7254,14 +7249,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
string ph = rules.Data[idx++].ToString();
- bool phantom;
- if (ph.Equals("1"))
- phantom = true;
- else
- phantom = false;
+ if (m_host.ParentGroup != null)
+ m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
- part.ScriptSetPhantomStatus(phantom);
break;
case (int)ScriptBaseClass.PRIM_PHYSICS:
@@ -7282,14 +7273,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (remain < 1)
return;
string temp = rules.Data[idx++].ToString();
- bool tempOnRez;
- if (temp.Equals("1"))
- tempOnRez = true;
- else
- tempOnRez = false;
+ if (m_host.ParentGroup != null)
+ m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
- part.ScriptSetTemporaryStatus(tempOnRez);
break;
case (int)ScriptBaseClass.PRIM_TEXGEN:
--
cgit v1.1
From bda1a4be4567181df6c18ce6e059ca8982bc5fa1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Aug 2011 00:26:37 +0100
Subject: rename test SceneSetupHelpers -> SceneHelpers for consistency
---
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 80b60a4..3f37ec7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
IConfig config = initConfigSource.AddConfig("XEngine");
config.Set("Enabled", "true");
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
XEngine.XEngine engine = new XEngine.XEngine();
engine.Initialise(initConfigSource);
--
cgit v1.1
From 78d8ce3816cde8702cfd4f5d198e2c69aff0a7be Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 8 Aug 2011 23:22:47 +0100
Subject: refactor: split out generic parts of osMakeNotecard() into a
separate. Add method doc. Other minor tidies.
---
.../Shared/Api/Implementation/OSSL_Api.cs | 157 +++++++++++++--------
1 file changed, 99 insertions(+), 58 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8093502..32ad21f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -348,20 +348,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
System.Threading.Thread.Sleep(delay);
}
- //
- // OpenSim functions
- //
public LSL_Integer osSetTerrainHeight(int x, int y, double val)
{
CheckThreatLevel(ThreatLevel.High, "osSetTerrainHeight");
return SetTerrainHeight(x, y, val);
}
+
public LSL_Integer osTerrainSetHeight(int x, int y, double val)
{
CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight");
OSSLDeprecated("osTerrainSetHeight", "osSetTerrainHeight");
return SetTerrainHeight(x, y, val);
}
+
private LSL_Integer SetTerrainHeight(int x, int y, double val)
{
m_host.AddScriptLPS(1);
@@ -384,12 +383,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.None, "osGetTerrainHeight");
return GetTerrainHeight(x, y);
}
+
public LSL_Float osTerrainGetHeight(int x, int y)
{
CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight");
OSSLDeprecated("osTerrainGetHeight", "osGetTerrainHeight");
return GetTerrainHeight(x, y);
}
+
private LSL_Float GetTerrainHeight(int x, int y)
{
m_host.AddScriptLPS(1);
@@ -1021,6 +1022,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
drawList += "PenColor " + color + "; ";
return drawList;
}
+
// Deprecated
public string osSetPenColour(string drawList, string colour)
{
@@ -1182,11 +1184,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSSLDeprecated("osSunGetParam", "osGetSunParam");
return GetSunParam(param);
}
+
public double osGetSunParam(string param)
{
CheckThreatLevel(ThreatLevel.None, "osGetSunParam");
return GetSunParam(param);
}
+
private double GetSunParam(string param)
{
m_host.AddScriptLPS(1);
@@ -1208,11 +1212,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSSLDeprecated("osSunSetParam", "osSetSunParam");
SetSunParam(param, value);
}
+
public void osSetSunParam(string param, double value)
{
CheckThreatLevel(ThreatLevel.None, "osSetSunParam");
SetSunParam(param, value);
}
+
private void SetSunParam(string param, double value)
{
m_host.AddScriptLPS(1);
@@ -1222,10 +1228,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
module.SetSunParameter(param, value);
}
-
}
-
public string osWindActiveModelPluginName()
{
CheckThreatLevel(ThreatLevel.None, "osWindActiveModelPluginName");
@@ -1304,12 +1308,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSSLDeprecated(functionName, "osSetParcelDetails");
SetParcelDetails(pos, rules, functionName);
}
+
public void osSetParcelDetails(LSL_Vector pos, LSL_List rules)
{
const string functionName = "osSetParcelDetails";
CheckThreatLevel(ThreatLevel.High, functionName);
SetParcelDetails(pos, rules, functionName);
}
+
private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName)
{
m_host.AddScriptLPS(1);
@@ -1429,8 +1435,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
voiceModule.setLandSIPAddress(SIPAddress,land.LandData.GlobalID);
else
OSSLError("osSetParcelSIPAddress: No voice module enabled for this land");
-
-
}
public string osGetScriptEngineName()
@@ -1683,8 +1687,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return jsondata;
}
- // send a message to to object identified by the given UUID, a script in the object must implement the dataserver function
- // the dataserver function is passed the ID of the calling function and a string message
+ ///
+ /// Send a message to to object identified by the given UUID
+ ///
+ ///
+ /// A script in the object must implement the dataserver function
+ /// the dataserver function is passed the ID of the calling function and a string message
+ ///
+ ///
+ ///
public void osMessageObject(LSL_Key objectUUID, string message)
{
CheckThreatLevel(ThreatLevel.Low, "osMessageObject");
@@ -1699,24 +1710,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
"dataserver", resobj, new DetectParams[0]));
}
-
- // This needs ThreatLevel high. It is an excellent griefer tool,
- // In a loop, it can cause asset bloat and DOS levels of asset
- // writes.
- //
+ ///
+ /// Write a notecard directly to the prim's inventory.
+ ///
+ ///
+ /// This needs ThreatLevel high. It is an excellent griefer tool,
+ /// In a loop, it can cause asset bloat and DOS levels of asset
+ /// writes.
+ ///
+ /// The name of the notecard to write.
+ /// The contents of the notecard.
public void osMakeNotecard(string notecardName, LSL_Types.list contents)
{
CheckThreatLevel(ThreatLevel.High, "osMakeNotecard");
m_host.AddScriptLPS(1);
+ StringBuilder notecardData = new StringBuilder();
+
+ for (int i = 0; i < contents.Length; i++)
+ notecardData.Append((string)(contents.GetLSLStringItem(i) + "\n"));
+
+ SaveNotecard(notecardName, notecardData.ToString());
+ }
+
+ protected void SaveNotecard(string notecardName, string notecardData)
+ {
// Create new asset
AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
asset.Description = "Script Generated Notecard";
- string notecardData = String.Empty;
-
- for (int i = 0; i < contents.Length; i++) {
- notecardData += contents.GetLSLStringItem(i) + "\n";
- }
int textLength = notecardData.Length;
notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
@@ -1726,7 +1747,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.AssetService.Store(asset);
// Create Task Entry
- TaskInventoryItem taskItem=new TaskInventoryItem();
+ TaskInventoryItem taskItem = new TaskInventoryItem();
taskItem.ResetIDs(m_host.UUID);
taskItem.ParentID = m_host.UUID;
@@ -1751,13 +1772,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.Inventory.AddInventoryItem(taskItem, false);
}
-
- /*Instead of using the LSL Dataserver event to pull notecard data,
- this will simply read the requested line and return its data as a string.
-
- Warning - due to the synchronous method this function uses to fetch assets, its use
- may be dangerous and unreliable while running in grid mode.
- */
+ ///
+ /// Directly get an entire notecard at once.
+ ///
+ ///
+ /// Instead of using the LSL Dataserver event to pull notecard data
+ /// this will simply read the entire notecard and return its data as a string.
+ ///
+ /// Warning - due to the synchronous method this function uses to fetch assets, its use
+ /// may be dangerous and unreliable while running in grid mode.
+ ///
+ /// Name of the notecard or its asset id
+ /// The line number to read. The first line is line 0
+ /// Notecard line
public string osGetNotecardLine(string name, int line)
{
CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecardLine");
@@ -1799,17 +1826,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
};
return NotecardCache.GetLine(assetID, line, 255);
-
-
}
- /*Instead of using the LSL Dataserver event to pull notecard data line by line,
- this will simply read the entire notecard and return its data as a string.
-
- Warning - due to the synchronous method this function uses to fetch assets, its use
- may be dangerous and unreliable while running in grid mode.
- */
-
+ ///
+ /// Get an entire notecard at once.
+ ///
+ ///
+ /// Instead of using the LSL Dataserver event to pull notecard data line by line,
+ /// this will simply read the entire notecard and return its data as a string.
+ ///
+ /// Warning - due to the synchronous method this function uses to fetch assets, its use
+ /// may be dangerous and unreliable while running in grid mode.
+ ///
+ /// Name of the notecard or its asset id
+ /// Notecard text
public string osGetNotecard(string name)
{
CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecard");
@@ -1857,17 +1887,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
return NotecardData;
-
-
}
- /*Instead of using the LSL Dataserver event to pull notecard data,
- this will simply read the number of note card lines and return this data as an integer.
-
- Warning - due to the synchronous method this function uses to fetch assets, its use
- may be dangerous and unreliable while running in grid mode.
- */
-
+ ///
+ /// Get the number of lines in the given notecard.
+ ///
+ ///
+ /// Instead of using the LSL Dataserver event to pull notecard data,
+ /// this will simply read the number of note card lines and return this data as an integer.
+ ///
+ /// Warning - due to the synchronous method this function uses to fetch assets, its use
+ /// may be dangerous and unreliable while running in grid mode.
+ ///
+ /// Name of the notecard or its asset id
+ ///
public int osGetNumberOfNotecardLines(string name)
{
CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNumberOfNotecardLines");
@@ -1947,15 +1980,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
return "";
}
-
}
+ ///
+ /// Get the nickname of this grid, as set in the [GridInfo] config section.
+ ///
+ ///
/// Threat level is Moderate because intentional abuse, for instance
/// scripts that are written to be malicious only on one grid,
/// for instance in a HG scenario, are a distinct possibility.
- ///
- /// Use value from the config file and return it.
- ///
+ ///
+ ///
public string osGetGridNick()
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
@@ -2063,12 +2098,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return World.RegionInfo.RegionSettings.LoadedCreationID;
}
- // Threat level is 'Low' because certain users could possibly be tricked into
- // dropping an unverified script into one of their own objects, which could
- // then gather the physical construction details of the object and transmit it
- // to an unscrupulous third party, thus permitting unauthorized duplication of
- // the object's form.
- //
+ ///
+ /// Get the primitive parameters of a linked prim.
+ ///
+ ///
+ /// Threat level is 'Low' because certain users could possibly be tricked into
+ /// dropping an unverified script into one of their own objects, which could
+ /// then gather the physical construction details of the object and transmit it
+ /// to an unscrupulous third party, thus permitting unauthorized duplication of
+ /// the object's form.
+ ///
+ ///
+ ///
+ ///
public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules)
{
CheckThreatLevel(ThreatLevel.High, "osGetLinkPrimitiveParams");
@@ -2344,10 +2386,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
obj.Shape.ProjectionFocus = (float)focus;
obj.Shape.ProjectionAmbiance = (float)amb;
-
obj.ParentGroup.HasGroupChanged = true;
obj.ScheduleFullUpdate();
-
}
///
@@ -2372,6 +2412,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
});
+
return result;
}
@@ -2391,4 +2432,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From 3e16a0fbdd9477f24a93e0e70311bfca7995e339 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Aug 2011 00:12:41 +0100
Subject: factor out common notecard caching code from 3 methods.
---
.../Shared/Api/Implementation/OSSL_Api.cs | 167 +++++++++------------
1 file changed, 74 insertions(+), 93 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 32ad21f..154179c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1733,7 +1733,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
SaveNotecard(notecardName, notecardData.ToString());
}
- protected void SaveNotecard(string notecardName, string notecardData)
+ ///
+ /// Save a notecard to prim inventory.
+ ///
+ ///
+ ///
+ /// Prim inventory item created.
+ protected TaskInventoryItem SaveNotecard(string notecardName, string notecardData)
{
// Create new asset
AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
@@ -1770,6 +1776,66 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
taskItem.AssetID = asset.FullID;
m_host.Inventory.AddInventoryItem(taskItem, false);
+
+ return taskItem;
+ }
+
+ ///
+ /// Load the notecard data found at the given prim inventory item name or asset uuid.
+ ///
+ ///
+ /// The text loaded. Null if no notecard was found.
+ protected string LoadNotecard(string notecardNameOrUuid)
+ {
+ UUID assetID = CacheNotecard(notecardNameOrUuid);
+ StringBuilder notecardData = new StringBuilder();
+
+ for (int count = 0; count < NotecardCache.GetLines(assetID); count++)
+ notecardData.Append(NotecardCache.GetLine(assetID, count, 255) + "\n");
+
+ return notecardData.ToString();
+ }
+
+ ///
+ /// Cache a notecard's contents.
+ ///
+ ///
+ ///
+ /// The asset id of the notecard, which is used for retrieving the cached data.
+ /// UUID.Zero if no asset could be found.
+ ///
+ protected UUID CacheNotecard(string notecardNameOrUuid)
+ {
+ UUID assetID = UUID.Zero;
+ StringBuilder notecardData = new StringBuilder();
+
+ if (!UUID.TryParse(notecardNameOrUuid, out assetID))
+ {
+ foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+ {
+ if (item.Type == 7 && item.Name == notecardNameOrUuid)
+ {
+ assetID = item.AssetID;
+ }
+ }
+ }
+
+ if (assetID == UUID.Zero)
+ return UUID.Zero;
+
+ if (!NotecardCache.IsCached(assetID))
+ {
+ AssetBase a = World.AssetService.Get(assetID.ToString());
+
+ if (a == null)
+ return UUID.Zero;
+
+ System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
+ string data = enc.GetString(a.Data);
+ NotecardCache.Cache(assetID, data);
+ };
+
+ return assetID;
}
///
@@ -1790,18 +1856,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecardLine");
m_host.AddScriptLPS(1);
- UUID assetID = UUID.Zero;
-
- if (!UUID.TryParse(name, out assetID))
- {
- foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
- {
- if (item.Type == 7 && item.Name == name)
- {
- assetID = item.AssetID;
- }
- }
- }
+ UUID assetID = CacheNotecard(name);
if (assetID == UUID.Zero)
{
@@ -1809,22 +1864,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return "ERROR!";
}
- if (!NotecardCache.IsCached(assetID))
- {
- AssetBase a = World.AssetService.Get(assetID.ToString());
- if (a != null)
- {
- System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
- string data = enc.GetString(a.Data);
- NotecardCache.Cache(assetID, data);
- }
- else
- {
- OSSLShoutError("Notecard '" + name + "' could not be found.");
- return "ERROR!";
- }
- };
-
return NotecardCache.GetLine(assetID, line, 255);
}
@@ -1845,48 +1884,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecard");
m_host.AddScriptLPS(1);
- UUID assetID = UUID.Zero;
- string NotecardData = "";
-
- if (!UUID.TryParse(name, out assetID))
- {
- foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
- {
- if (item.Type == 7 && item.Name == name)
- {
- assetID = item.AssetID;
- }
- }
- }
+ string text = LoadNotecard(name);
- if (assetID == UUID.Zero)
+ if (text == null)
{
OSSLShoutError("Notecard '" + name + "' could not be found.");
return "ERROR!";
}
-
- if (!NotecardCache.IsCached(assetID))
- {
- AssetBase a = World.AssetService.Get(assetID.ToString());
- if (a != null)
- {
- System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
- string data = enc.GetString(a.Data);
- NotecardCache.Cache(assetID, data);
- }
- else
- {
- OSSLShoutError("Notecard '" + name + "' could not be found.");
- return "ERROR!";
- }
- };
-
- for (int count = 0; count < NotecardCache.GetLines(assetID); count++)
+ else
{
- NotecardData += NotecardCache.GetLine(assetID, count, 255) + "\n";
+ return text;
}
-
- return NotecardData;
}
///
@@ -1906,18 +1914,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNumberOfNotecardLines");
m_host.AddScriptLPS(1);
- UUID assetID = UUID.Zero;
-
- if (!UUID.TryParse(name, out assetID))
- {
- foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
- {
- if (item.Type == 7 && item.Name == name)
- {
- assetID = item.AssetID;
- }
- }
- }
+ UUID assetID = CacheNotecard(name);
if (assetID == UUID.Zero)
{
@@ -1925,22 +1922,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return -1;
}
- if (!NotecardCache.IsCached(assetID))
- {
- AssetBase a = World.AssetService.Get(assetID.ToString());
- if (a != null)
- {
- System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
- string data = enc.GetString(a.Data);
- NotecardCache.Cache(assetID, data);
- }
- else
- {
- OSSLShoutError("Notecard '" + name + "' could not be found.");
- return -1;
- }
- };
-
return NotecardCache.GetLines(assetID);
}
@@ -2412,7 +2393,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
});
-
+
return result;
}
--
cgit v1.1
From e869eeb0bfc48c769f680970f99e4c67dd5a1a70 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Aug 2011 03:51:34 +0100
Subject: Implement first draft functions for saving and loading NPC appearance
from storage.
This works by serializing and deserializing NPC AvatarAppearance to a notecard in the prim inventory and making the required baked textures permanent.
By using notecards, we avoid lots of awkward, technical and user-unfriendly issues concerning retaining asset references and creating a new asset type.
Notecards also allow different appearances to be swapped and manipulated easily.
This also allows stored NPC appearances to work transparently with OARs/IARs since the UUID scan will pick up and store the necessary references from the notecard text.
This works in my basic test but is not at all ready for user use or bug reporting yet.
---
.../Shared/Api/Implementation/LSL_Api.cs | 33 +++++--
.../Shared/Api/Implementation/OSSL_Api.cs | 104 ++++++++++++++++++---
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 10 ++
4 files changed, 130 insertions(+), 19 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7c21ba9..86ee28a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10565,9 +10565,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
- public static string GetLine(UUID assetID, int line, int maxLength)
+ ///
+ /// Get a notecard line.
+ ///
+ ///
+ /// Lines start at index 0
+ ///
+ public static string GetLine(UUID assetID, int lineNumber)
{
- if (line < 0)
+ if (lineNumber < 0)
return "";
string data;
@@ -10579,17 +10585,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
m_Notecards[assetID].lastRef = DateTime.Now;
- if (line >= m_Notecards[assetID].text.Length)
+ if (lineNumber >= m_Notecards[assetID].text.Length)
return "\n\n\n";
- data = m_Notecards[assetID].text[line];
- if (data.Length > maxLength)
- data = data.Substring(0, maxLength);
+ data = m_Notecards[assetID].text[lineNumber];
return data;
}
}
+ ///
+ /// Get a notecard line.
+ ///
+ ///
+ /// Lines start at index 0
+ /// Maximum length of the returned line. Longer lines will be truncated
+ ///
+ public static string GetLine(UUID assetID, int lineNumber, int maxLength)
+ {
+ string line = GetLine(assetID, lineNumber);
+
+ if (line.Length > maxLength)
+ line = line.Substring(0, maxLength);
+
+ return line;
+ }
+
public static void CacheCheck()
{
foreach (UUID key in new List(m_Notecards.Keys))
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 154179c..07b36de 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -28,11 +28,16 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
using System.Runtime.Remoting.Lifetime;
using System.Text;
using System.Net;
using System.Threading;
+using System.Xml;
+using log4net;
using OpenMetaverse;
+using OpenMetaverse.StructuredData;
using Nini.Config;
using OpenSim;
using OpenSim.Framework;
@@ -119,6 +124,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
[Serializable]
public class OSSL_Api : MarshalByRefObject, IOSSL_Api, IScriptApi
{
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
internal IScriptEngine m_ScriptEngine;
internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there
internal SceneObjectPart m_host;
@@ -1730,26 +1737,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
for (int i = 0; i < contents.Length; i++)
notecardData.Append((string)(contents.GetLSLStringItem(i) + "\n"));
- SaveNotecard(notecardName, notecardData.ToString());
+ SaveNotecard(notecardName, "Script generated notecard", notecardData.ToString(), false);
}
///
/// Save a notecard to prim inventory.
///
- ///
+ ///
+ /// Description of notecard
///
+ ///
+ /// If true, then if an item exists with the same name, it is replaced.
+ /// If false, then a new item is created witha slightly different name (e.g. name 1)
+ ///
/// Prim inventory item created.
- protected TaskInventoryItem SaveNotecard(string notecardName, string notecardData)
+ protected TaskInventoryItem SaveNotecard(string name, string description, string data, bool forceSameName)
{
// Create new asset
- AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
- asset.Description = "Script Generated Notecard";
+ AssetBase asset = new AssetBase(UUID.Random(), name, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
+ asset.Description = description;
- int textLength = notecardData.Length;
- notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
- + textLength.ToString() + "\n" + notecardData + "}\n";
+ int textLength = data.Length;
+ data
+ = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
+ + textLength.ToString() + "\n" + data + "}\n";
- asset.Data = Util.UTF8.GetBytes(notecardData);
+ asset.Data = Util.UTF8.GetBytes(data);
World.AssetService.Store(asset);
// Create Task Entry
@@ -1775,7 +1788,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
taskItem.PermsMask = 0;
taskItem.AssetID = asset.FullID;
- m_host.Inventory.AddInventoryItem(taskItem, false);
+ if (forceSameName)
+ m_host.Inventory.AddInventoryItemExclusive(taskItem, false);
+ else
+ m_host.Inventory.AddInventoryItem(taskItem, false);
return taskItem;
}
@@ -1791,7 +1807,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
StringBuilder notecardData = new StringBuilder();
for (int count = 0; count < NotecardCache.GetLines(assetID); count++)
- notecardData.Append(NotecardCache.GetLine(assetID, count, 255) + "\n");
+ {
+ string line = NotecardCache.GetLine(assetID, count) + "\n";
+
+// m_log.DebugFormat("[OSSL]: From notecard {0} loading line {1}", notecardNameOrUuid, line);
+
+ notecardData.Append(line);
+ }
return notecardData.ToString();
}
@@ -1807,7 +1829,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected UUID CacheNotecard(string notecardNameOrUuid)
{
UUID assetID = UUID.Zero;
- StringBuilder notecardData = new StringBuilder();
if (!UUID.TryParse(notecardNameOrUuid, out assetID))
{
@@ -1864,7 +1885,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return "ERROR!";
}
- return NotecardCache.GetLine(assetID, line, 255);
+ return NotecardCache.GetLine(assetID, line);
}
///
@@ -2122,9 +2143,66 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return new LSL_Key(x.ToString());
}
+
return new LSL_Key(UUID.Zero.ToString());
}
+ public LSL_Key osNpcSaveAppearance(string avatar, string notecardName)
+ {
+ CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance");
+
+ INPCModule npcModule = World.RequestModuleInterface();
+ IAvatarFactory appearanceModule = World.RequestModuleInterface();
+
+ if (npcModule != null && appearanceModule != null)
+ {
+ UUID avatarId = UUID.Zero;
+ if (!UUID.TryParse(avatar, out avatarId))
+ return new LSL_Key(UUID.Zero.ToString());
+
+ if (!npcModule.IsNPC(avatarId, m_host.ParentGroup.Scene))
+ return new LSL_Key(UUID.Zero.ToString());
+
+ appearanceModule.SaveBakedTextures(avatarId);
+ ScenePresence sp = m_host.ParentGroup.Scene.GetScenePresence(avatarId);
+ OSDMap appearancePacked = sp.Appearance.Pack();
+
+ TaskInventoryItem item
+ = SaveNotecard(notecardName, "Avatar Appearance", Util.GetFormattedXml(appearancePacked as OSD), true);
+
+ return new LSL_Key(item.AssetID.ToString());
+ }
+
+ return new LSL_Key(UUID.Zero.ToString());
+ }
+
+ public void osNpcLoadAppearance(string avatar, string notecardNameOrUuid)
+ {
+ CheckThreatLevel(ThreatLevel.High, "osNpcLoadAppearance");
+
+ INPCModule npcModule = World.RequestModuleInterface();
+
+ if (npcModule != null)
+ {
+ UUID avatarId = UUID.Zero;
+ if (!UUID.TryParse(avatar, out avatarId))
+ return;
+
+ if (!npcModule.IsNPC(avatarId, m_host.ParentGroup.Scene))
+ return;
+
+ string appearanceSerialized = LoadNotecard(notecardNameOrUuid);
+ OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
+// OSD a = OSDParser.DeserializeLLSDXml(appearanceSerialized);
+// Console.WriteLine("appearanceSerialized {0}", appearanceSerialized);
+// Console.WriteLine("a.Type {0}, a.ToString() {1}", a.Type, a);
+ AvatarAppearance appearance = new AvatarAppearance();
+ appearance.Unpack(appearanceOsd);
+
+ npcModule.SetNPCAppearance(avatarId, appearance, m_host.ParentGroup.Scene);
+ }
+ }
+
public void osNpcMoveTo(LSL_Key npc, LSL_Vector position)
{
CheckThreatLevel(ThreatLevel.High, "osNpcMoveTo");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 19352f0..868af27 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -170,6 +170,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
key osNpcCreate(string user, string name, vector position, key cloneFrom);
+ LSL_Key osNpcSaveAppearance(string avatar, string notecardName);
+ void osNpcLoadAppearance(string avatar, string notecardNameOrUuid);
void osNpcMoveTo(key npc, vector position);
void osNpcSay(key npc, string message);
void osNpcRemove(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 7c59098..959b5d5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -483,6 +483,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom);
}
+ public key osNpcSaveAppearance(string avatar, string notecardName)
+ {
+ return m_OSSL_Functions.osNpcSaveAppearance(avatar, notecardName);
+ }
+
+ public void osNpcLoadAppearance(string avatar, string notecardNameOrUuid)
+ {
+ m_OSSL_Functions.osNpcLoadAppearance(avatar, notecardNameOrUuid);
+ }
+
public void osNpcMoveTo(key npc, vector position)
{
m_OSSL_Functions.osNpcMoveTo(npc, position);
--
cgit v1.1
From 795c8e6c22d4174d942ad56e70a0acbe507e2ec7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 9 Aug 2011 22:05:47 +0100
Subject: Add osOwnerSaveAppearance() to help with setting up NPC appearances.
Not yet ready for user use.
Adds regression test.
---
.../Shared/Api/Implementation/OSSL_Api.cs | 51 ++++++++--
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +
.../Shared/Tests/OSSL_ApiAppearanceTest.cs | 105 +++++++++++++++++++++
4 files changed, 153 insertions(+), 10 deletions(-)
create mode 100644 OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 07b36de..a05c623 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2147,14 +2147,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return new LSL_Key(UUID.Zero.ToString());
}
+ ///
+ /// Save the current appearance of the NPC permanently to the named notecard.
+ ///
+ ///
+ /// The name of the notecard to which to save the appearance.
+ /// The asset ID of the notecard saved.
public LSL_Key osNpcSaveAppearance(string avatar, string notecardName)
{
CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance");
INPCModule npcModule = World.RequestModuleInterface();
- IAvatarFactory appearanceModule = World.RequestModuleInterface();
- if (npcModule != null && appearanceModule != null)
+ if (npcModule != null)
{
UUID avatarId = UUID.Zero;
if (!UUID.TryParse(avatar, out avatarId))
@@ -2163,14 +2168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!npcModule.IsNPC(avatarId, m_host.ParentGroup.Scene))
return new LSL_Key(UUID.Zero.ToString());
- appearanceModule.SaveBakedTextures(avatarId);
- ScenePresence sp = m_host.ParentGroup.Scene.GetScenePresence(avatarId);
- OSDMap appearancePacked = sp.Appearance.Pack();
-
- TaskInventoryItem item
- = SaveNotecard(notecardName, "Avatar Appearance", Util.GetFormattedXml(appearancePacked as OSD), true);
-
- return new LSL_Key(item.AssetID.ToString());
+ return SaveAppearanceToNotecard(avatarId, notecardName);
}
return new LSL_Key(UUID.Zero.ToString());
@@ -2236,6 +2234,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
module.DeleteNPC(new UUID(npc.m_string), World);
}
}
+
+ ///
+ /// Save the current appearance of the script owner permanently to the named notecard.
+ ///
+ /// The name of the notecard to which to save the appearance.
+ /// The asset ID of the notecard saved.
+ public LSL_Key osOwnerSaveAppearance(string notecardName)
+ {
+ CheckThreatLevel(ThreatLevel.High, "osOwnerSaveAppearance");
+
+ return SaveAppearanceToNotecard(m_host.OwnerID, notecardName);
+ }
+
+ protected LSL_Key SaveAppearanceToNotecard(UUID avatarId, string notecardName)
+ {
+ IAvatarFactory appearanceModule = World.RequestModuleInterface();
+
+ if (appearanceModule != null)
+ {
+ appearanceModule.SaveBakedTextures(m_host.OwnerID);
+ ScenePresence sp = m_host.ParentGroup.Scene.GetScenePresence(m_host.OwnerID);
+ OSDMap appearancePacked = sp.Appearance.Pack();
+
+ TaskInventoryItem item
+ = SaveNotecard(notecardName, "Avatar Appearance", Util.GetFormattedXml(appearancePacked as OSD), true);
+
+ return new LSL_Key(item.AssetID.ToString());
+ }
+ else
+ {
+ return new LSL_Key(UUID.Zero.ToString());
+ }
+ }
///
/// Get current region's map texture UUID
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 868af27..92473ae 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -176,6 +176,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osNpcSay(key npc, string message);
void osNpcRemove(key npc);
+ LSL_Key osOwnerSaveAppearance(string notecardName);
+
key osGetMapTexture();
key osGetRegionMapTexture(string regionName);
LSL_List osGetRegionStats();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 959b5d5..4b21c88 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -508,6 +508,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcRemove(npc);
}
+ public LSL_Key osOwnerSaveAppearance(string notecardName)
+ {
+ return m_OSSL_Functions.osOwnerSaveAppearance(notecardName);
+ }
+
public OSSLPrim Prim;
[Serializable]
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
new file mode 100644
index 0000000..fc8b551
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+ ///
+ /// Tests for OSSL_Api
+ ///
+ [TestFixture]
+ public class OSSL_ApiAppearanceTest
+ {
+ [Test]
+ public void TestOsOwnerSaveAppearance()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ IConfigSource initConfigSource = new IniConfigSource();
+ IConfig config = initConfigSource.AddConfig("XEngine");
+ config.Set("Enabled", "true");
+ config.Set("AllowOSFunctions", "true");
+ config.Set("OSFunctionThreatLevel", "Severe");
+
+ UUID userId = TestHelpers.ParseTail(0x1);
+ float newHeight = 1.9f;
+
+ Scene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, new AvatarFactoryModule());
+ ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
+ sp.Appearance.AvatarHeight = newHeight;
+ SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+ SceneObjectPart part = so.RootPart;
+ scene.AddSceneObject(so);
+
+ XEngine.XEngine engine = new XEngine.XEngine();
+ engine.Initialise(initConfigSource);
+ engine.AddRegion(scene);
+
+ OSSL_Api osslApi = new OSSL_Api();
+ osslApi.Initialize(engine, part, part.LocalId, part.UUID);
+
+ string notecardName = "appearanceNc";
+
+ osslApi.osOwnerSaveAppearance(notecardName);
+
+ IList items = part.Inventory.GetInventoryItems(notecardName);
+ Assert.That(items.Count, Is.EqualTo(1));
+
+ TaskInventoryItem ncItem = items[0];
+ Assert.That(ncItem.Name, Is.EqualTo(notecardName));
+
+ AssetBase ncAsset = scene.AssetService.Get(ncItem.AssetID.ToString());
+ Assert.That(ncAsset, Is.Not.Null);
+
+ AssetNotecard anc = new AssetNotecard(UUID.Zero, ncAsset.Data);
+ anc.Decode();
+ OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(anc.BodyText);
+ AvatarAppearance savedAppearance = new AvatarAppearance();
+ savedAppearance.Unpack(appearanceOsd);
+
+ Assert.That(savedAppearance.AvatarHeight, Is.EqualTo(sp.Appearance.AvatarHeight));
+ }
+ }
+}
\ No newline at end of file
--
cgit v1.1
From 195c1dc9b8b8511980d9a607a242b24a5a91da17 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Aug 2011 00:26:38 +0100
Subject: implement osNpcStopMoveTo() to cancel any current move target
---
.../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 9 +++++++++
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 +
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +++++
3 files changed, 15 insertions(+)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index a05c623..9c32029 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2213,6 +2213,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
+ public void osNpcStopMoveTo(LSL_Key npc)
+ {
+ CheckThreatLevel(ThreatLevel.VeryLow, "osNpcStopMoveTo");
+
+ INPCModule module = World.RequestModuleInterface();
+ if (module != null)
+ module.StopMoveToTarget(new UUID(npc.m_string), World);
+ }
+
public void osNpcSay(LSL_Key npc, string message)
{
CheckThreatLevel(ThreatLevel.High, "osNpcSay");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 92473ae..ab0097a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -173,6 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Key osNpcSaveAppearance(string avatar, string notecardName);
void osNpcLoadAppearance(string avatar, string notecardNameOrUuid);
void osNpcMoveTo(key npc, vector position);
+ void osNpcStopMoveTo(LSL_Key npc);
void osNpcSay(key npc, string message);
void osNpcRemove(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 4b21c88..a7843dd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -498,6 +498,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcMoveTo(npc, position);
}
+ public void osNpcStopMoveTo(LSL_Key npc)
+ {
+ m_OSSL_Functions.osNpcStopMoveTo(npc);
+ }
+
public void osNpcSay(key npc, string message)
{
m_OSSL_Functions.osNpcSay(npc, message);
--
cgit v1.1
From 5d6c9644faf6aeac38410af9cff97adfef88d7aa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Aug 2011 01:47:37 +0100
Subject: early code to allow scripts to force npcs not to fly when moving to
target
this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path.
currently implemented in osNpcMoveToTarget(), but none of this is final.
---
.../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 14 +++++++++++++-
.../Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 +
.../Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +++++
3 files changed, 19 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9c32029..63c882d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2209,7 +2209,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (module != null)
{
Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
- module.MoveToTarget(new UUID(npc.m_string), World, pos);
+ module.MoveToTarget(new UUID(npc.m_string), World, pos, false);
+ }
+ }
+
+ public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int noFly)
+ {
+ CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget");
+
+ INPCModule module = World.RequestModuleInterface();
+ if (module != null)
+ {
+ Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
+ module.MoveToTarget(new UUID(npc.m_string), World, pos, noFly != 0);
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index ab0097a..56be9d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -173,6 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Key osNpcSaveAppearance(string avatar, string notecardName);
void osNpcLoadAppearance(string avatar, string notecardNameOrUuid);
void osNpcMoveTo(key npc, vector position);
+ void osNpcMoveToTarget(key npc, vector position, int noFly);
void osNpcStopMoveTo(LSL_Key npc);
void osNpcSay(key npc, string message);
void osNpcRemove(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 a7843dd..c745e5c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -498,6 +498,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcMoveTo(npc, position);
}
+ public void osNpcMoveToTarget(key npc, vector position, int noFly)
+ {
+ m_OSSL_Functions.osNpcMoveToTarget(npc, position, noFly);
+ }
+
public void osNpcStopMoveTo(LSL_Key npc)
{
m_OSSL_Functions.osNpcStopMoveTo(npc);
--
cgit v1.1
From fb92678b83dca1c1f64cc91f3ac887170408a455 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Aug 2011 22:34:42 +0100
Subject: fly and no fly constants for osNpcMoveToTarget()
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 63c882d..9b5d8d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2220,7 +2220,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
INPCModule module = World.RequestModuleInterface();
if (module != null)
{
- Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
+ Vector3 pos = new Vector3((float)position.x, (float)position.y, (float)position.z);
module.MoveToTarget(new UUID(npc.m_string), World, pos, noFly != 0);
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 3f90788..9ed894c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -591,6 +591,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int STATS_ACTIVE_SCRIPTS = 19;
public const int STATS_SCRIPT_LPS = 20;
+ // Constants for osNpc* functions
+ public const int OS_NPC_FLY = 0;
+ public const int OS_NPC_NO_FLY = 1;
+
public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
--
cgit v1.1
From 7f499ff3f386d57bcd81ebb3f58f110011100604 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 10 Aug 2011 23:56:19 +0100
Subject: Add a OS_NPC_LAND_AT_TARGET option to osMoveToTarget()
Default for this function is now not to automatically land.
This allows better control by scripts when an avatar is going to be landing on a prim rather than the ground.
Stopping the avatar involves faking a collision, to avoid the pid controller making it overshoot.
A better approach would be to gradually slow the avatar as we near the target
---
.../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 11 ++++++++---
.../Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 1 +
2 files changed, 9 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9b5d8d9..f83304b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2209,11 +2209,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (module != null)
{
Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
- module.MoveToTarget(new UUID(npc.m_string), World, pos, false);
+ module.MoveToTarget(new UUID(npc.m_string), World, pos, false, true);
}
}
- public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int noFly)
+ public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int moveParams)
{
CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget");
@@ -2221,7 +2221,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (module != null)
{
Vector3 pos = new Vector3((float)position.x, (float)position.y, (float)position.z);
- module.MoveToTarget(new UUID(npc.m_string), World, pos, noFly != 0);
+ module.MoveToTarget(
+ new UUID(npc.m_string),
+ World,
+ pos,
+ (moveParams & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
+ (moveParams & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0);
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 9ed894c..e82c281 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -594,6 +594,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
// Constants for osNpc* functions
public const int OS_NPC_FLY = 0;
public const int OS_NPC_NO_FLY = 1;
+ public const int OS_NPC_LAND_AT_TARGET = 2;
public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
--
cgit v1.1
From 4402851b086e7faf0d441d2ae0d5f6a3e1ea04b8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 01:56:42 +0100
Subject: Get NPCs to revert to the correct 'resting' animation (e.g. stand or
hover) after finishing their movement. This also fixes judder after an
avatar has finished "go here"/autopilot movement in a viewer.
This meant reseting the SP.AgentControlFlags since the Animator uses these to determine the correct default animation.
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index f83304b..71fc15f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -870,7 +870,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence target = (ScenePresence)World.Entities[avatarID];
if (target != null)
{
- UUID animID=UUID.Zero;
+ UUID animID = UUID.Zero;
lock (m_host.TaskInventory)
{
foreach (KeyValuePair inv in m_host.TaskInventory)
--
cgit v1.1
From ee22569c9262277467df9a4b15674a1472fa0b71 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 02:19:13 +0100
Subject: only accept npc UUIDs to osNpc* functions, not names (except for
create)
---
.../Shared/Api/Implementation/OSSL_Api.cs | 26 +++++++++-------------
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 6 ++---
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 12 +++++-----
3 files changed, 20 insertions(+), 24 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 71fc15f..91ac3b7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2153,7 +2153,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
///
/// The name of the notecard to which to save the appearance.
/// The asset ID of the notecard saved.
- public LSL_Key osNpcSaveAppearance(string avatar, string notecardName)
+ public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecardName)
{
CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance");
@@ -2161,20 +2161,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (npcModule != null)
{
- UUID avatarId = UUID.Zero;
- if (!UUID.TryParse(avatar, out avatarId))
- return new LSL_Key(UUID.Zero.ToString());
+ UUID npcId = new UUID(npc.m_string);
- if (!npcModule.IsNPC(avatarId, m_host.ParentGroup.Scene))
+ if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
return new LSL_Key(UUID.Zero.ToString());
- return SaveAppearanceToNotecard(avatarId, notecardName);
+ return SaveAppearanceToNotecard(npcId, notecardName);
}
return new LSL_Key(UUID.Zero.ToString());
}
- public void osNpcLoadAppearance(string avatar, string notecardNameOrUuid)
+ public void osNpcLoadAppearance(LSL_Key npc, string notecardNameOrUuid)
{
CheckThreatLevel(ThreatLevel.High, "osNpcLoadAppearance");
@@ -2182,11 +2180,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (npcModule != null)
{
- UUID avatarId = UUID.Zero;
- if (!UUID.TryParse(avatar, out avatarId))
- return;
+ UUID npcId = new UUID(npc.m_string);
- if (!npcModule.IsNPC(avatarId, m_host.ParentGroup.Scene))
+ if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
return;
string appearanceSerialized = LoadNotecard(notecardNameOrUuid);
@@ -2197,7 +2193,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AvatarAppearance appearance = new AvatarAppearance();
appearance.Unpack(appearanceOsd);
- npcModule.SetNPCAppearance(avatarId, appearance, m_host.ParentGroup.Scene);
+ npcModule.SetNPCAppearance(npcId, appearance, m_host.ParentGroup.Scene);
}
}
@@ -2213,7 +2209,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
- public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int moveParams)
+ public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int options)
{
CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget");
@@ -2225,8 +2221,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
new UUID(npc.m_string),
World,
pos,
- (moveParams & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
- (moveParams & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0);
+ (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
+ (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0);
}
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 56be9d9..f4a618b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -170,10 +170,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
key osNpcCreate(string user, string name, vector position, key cloneFrom);
- LSL_Key osNpcSaveAppearance(string avatar, string notecardName);
- void osNpcLoadAppearance(string avatar, string notecardNameOrUuid);
+ LSL_Key osNpcSaveAppearance(key npc, string notecardName);
+ void osNpcLoadAppearance(key npc, string notecardNameOrUuid);
void osNpcMoveTo(key npc, vector position);
- void osNpcMoveToTarget(key npc, vector position, int noFly);
+ void osNpcMoveToTarget(key npc, vector position, int options);
void osNpcStopMoveTo(LSL_Key npc);
void osNpcSay(key npc, string message);
void osNpcRemove(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 c745e5c..84d61f4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -483,14 +483,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom);
}
- public key osNpcSaveAppearance(string avatar, string notecardName)
+ public key osNpcSaveAppearance(key npc, string notecardName)
{
- return m_OSSL_Functions.osNpcSaveAppearance(avatar, notecardName);
+ return m_OSSL_Functions.osNpcSaveAppearance(npc, notecardName);
}
- public void osNpcLoadAppearance(string avatar, string notecardNameOrUuid)
+ public void osNpcLoadAppearance(key npc, string notecardNameOrUuid)
{
- m_OSSL_Functions.osNpcLoadAppearance(avatar, notecardNameOrUuid);
+ m_OSSL_Functions.osNpcLoadAppearance(npc, notecardNameOrUuid);
}
public void osNpcMoveTo(key npc, vector position)
@@ -498,9 +498,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcMoveTo(npc, position);
}
- public void osNpcMoveToTarget(key npc, vector position, int noFly)
+ public void osNpcMoveToTarget(key npc, vector position, int options)
{
- m_OSSL_Functions.osNpcMoveToTarget(npc, position, noFly);
+ m_OSSL_Functions.osNpcMoveToTarget(npc, position, options);
}
public void osNpcStopMoveTo(LSL_Key npc)
--
cgit v1.1
From 83ca5a101d5578282ba0fd7177fcb618f70d3cc9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 20:56:18 +0100
Subject: Split out to-be-common setup stuff from TestOsOwnerSaveAppearance()
---
.../Shared/Tests/OSSL_ApiAppearanceTest.cs | 48 +++++++++++++++-------
1 file changed, 33 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index fc8b551..2218a1f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -50,35 +50,53 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
[TestFixture]
public class OSSL_ApiAppearanceTest
{
- [Test]
- public void TestOsOwnerSaveAppearance()
- {
- TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
+ protected Scene m_scene;
+ protected XEngine.XEngine m_engine;
+ [SetUp]
+ public void SetUp()
+ {
IConfigSource initConfigSource = new IniConfigSource();
IConfig config = initConfigSource.AddConfig("XEngine");
config.Set("Enabled", "true");
config.Set("AllowOSFunctions", "true");
config.Set("OSFunctionThreatLevel", "Severe");
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, new AvatarFactoryModule());
+
+ m_engine = new XEngine.XEngine();
+ m_engine.Initialise(initConfigSource);
+ m_engine.AddRegion(m_scene);
+ }
+
+ ///
+ /// Test creation of an NPC where the appearance data comes from a notecard
+ ///
+// [Test]
+// public void TestOsNpcCreateFromNotecard()
+// {
+// TestHelpers.InMethod();
+//// log4net.Config.XmlConfigurator.Configure();
+// }
+
+ [Test]
+ public void TestOsOwnerSaveAppearance()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
UUID userId = TestHelpers.ParseTail(0x1);
float newHeight = 1.9f;
- Scene scene = SceneHelpers.SetupScene();
- SceneHelpers.SetupSceneModules(scene, new AvatarFactoryModule());
- ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
+ ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
sp.Appearance.AvatarHeight = newHeight;
SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
SceneObjectPart part = so.RootPart;
- scene.AddSceneObject(so);
-
- XEngine.XEngine engine = new XEngine.XEngine();
- engine.Initialise(initConfigSource);
- engine.AddRegion(scene);
+ m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
- osslApi.Initialize(engine, part, part.LocalId, part.UUID);
+ osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
string notecardName = "appearanceNc";
@@ -90,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
TaskInventoryItem ncItem = items[0];
Assert.That(ncItem.Name, Is.EqualTo(notecardName));
- AssetBase ncAsset = scene.AssetService.Get(ncItem.AssetID.ToString());
+ AssetBase ncAsset = m_scene.AssetService.Get(ncItem.AssetID.ToString());
Assert.That(ncAsset, Is.Not.Null);
AssetNotecard anc = new AssetNotecard(UUID.Zero, ncAsset.Data);
--
cgit v1.1
From 50945dd56029a1280c581ea9b29213ab0e162a0a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 21:43:26 +0100
Subject: add regression test for osNpcCreate when cloning an in-region avatar
---
.../Shared/Api/Implementation/OSSL_Api.cs | 6 +-
.../Shared/Tests/OSSL_ApiAppearanceTest.cs | 79 ++++++++++++++++++++--
2 files changed, 77 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 91ac3b7..b18aa3b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2135,11 +2135,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
INPCModule module = World.RequestModuleInterface();
if (module != null)
{
+ ScenePresence clonePresence = World.GetScenePresence(new UUID(cloneFrom.m_string));
+ if (clonePresence == null)
+ return new LSL_Key(UUID.Zero.ToString());
+
UUID x = module.CreateNPC(firstname,
lastname,
new Vector3((float) position.x, (float) position.y, (float) position.z),
World,
- new UUID(cloneFrom));
+ clonePresence.Appearance);
return new LSL_Key(x.ToString());
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 2218a1f..7f778d7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -27,7 +27,9 @@
using System;
using System.Collections.Generic;
+using System.Reflection;
using System.Text;
+using log4net;
using Nini.Config;
using NUnit.Framework;
using OpenMetaverse;
@@ -35,6 +37,7 @@ using OpenMetaverse.Assets;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
+using OpenSim.Region.OptionalModules.World.NPC;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api;
@@ -61,9 +64,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
config.Set("Enabled", "true");
config.Set("AllowOSFunctions", "true");
config.Set("OSFunctionThreatLevel", "Severe");
+ config = initConfigSource.AddConfig("NPC");
+ config.Set("Enabled", "true");
m_scene = SceneHelpers.SetupScene();
- SceneHelpers.SetupSceneModules(m_scene, new AvatarFactoryModule());
+ SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
m_engine = new XEngine.XEngine();
m_engine.Initialise(initConfigSource);
@@ -73,12 +78,72 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
///
/// Test creation of an NPC where the appearance data comes from a notecard
///
-// [Test]
-// public void TestOsNpcCreateFromNotecard()
-// {
-// TestHelpers.InMethod();
-//// log4net.Config.XmlConfigurator.Configure();
-// }
+ //[Test]
+ public void TestOsNpcCreateFromNotecard()
+ {
+ TestHelpers.InMethod();
+ log4net.Config.XmlConfigurator.Configure();
+
+ // Store an avatar with a different height from default in a notecard.
+ UUID userId = TestHelpers.ParseTail(0x1);
+ float newHeight = 1.9f;
+
+ ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+ sp.Appearance.AvatarHeight = newHeight;
+ SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+ SceneObjectPart part = so.RootPart;
+ m_scene.AddSceneObject(so);
+
+ OSSL_Api osslApi = new OSSL_Api();
+ osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+
+ string notecardName = "appearanceNc";
+ osslApi.osOwnerSaveAppearance(notecardName);
+
+ // Try creating a bot using the appearance in the notecard.
+ string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName);
+ Assert.That(npcRaw, Is.Not.Null);
+
+ UUID npcId = new UUID(npcRaw);
+ ScenePresence npc = m_scene.GetScenePresence(npcId);
+ Assert.That(npc, Is.Not.Null);
+ Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
+ }
+
+ ///
+ /// Test creation of an NPC where the appearance data comes from an avatar already in the region.
+ ///
+ [Test]
+ public void TestOsNpcCreateFromAvatar()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ // Store an avatar with a different height from default in a notecard.
+ UUID userId = TestHelpers.ParseTail(0x1);
+ float newHeight = 1.9f;
+
+ ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+ sp.Appearance.AvatarHeight = newHeight;
+ SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+ SceneObjectPart part = so.RootPart;
+ m_scene.AddSceneObject(so);
+
+ OSSL_Api osslApi = new OSSL_Api();
+ osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+
+ string notecardName = "appearanceNc";
+ osslApi.osOwnerSaveAppearance(notecardName);
+
+ // Try creating a bot using the existing avatar's appearance
+ string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), sp.UUID.ToString());
+ Assert.That(npcRaw, Is.Not.Null);
+
+ UUID npcId = new UUID(npcRaw);
+ ScenePresence npc = m_scene.GetScenePresence(npcId);
+ Assert.That(npc, Is.Not.Null);
+ Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
+ }
[Test]
public void TestOsOwnerSaveAppearance()
--
cgit v1.1
From b1ae930c6b8e7d985e2c148a4e18a59ac880dcbd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 22:26:47 +0100
Subject: Implement osAgentSaveAppearance() to save the appearance of an avatar
in the region to a notecard
This is separate from osOwnerSaveAppearance() so that owner saves can be allowed without allowing arbitrary avatar saves
---
.../Shared/Api/Implementation/OSSL_Api.cs | 35 +++++++++++++++---
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +-
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +++
.../Shared/Tests/OSSL_ApiAppearanceTest.cs | 41 ++++++++++++++++++++++
4 files changed, 78 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index b18aa3b..939602a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2165,7 +2165,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (npcModule != null)
{
- UUID npcId = new UUID(npc.m_string);
+ UUID npcId;
+ if (!UUID.TryParse(npc.m_string, out npcId))
+ return new LSL_Key(UUID.Zero.ToString());
if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
return new LSL_Key(UUID.Zero.ToString());
@@ -2273,14 +2275,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return SaveAppearanceToNotecard(m_host.OwnerID, notecardName);
}
- protected LSL_Key SaveAppearanceToNotecard(UUID avatarId, string notecardName)
+ public LSL_Key osAgentSaveAppearance(LSL_Key avatarId, string notecardName)
+ {
+ CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance");
+
+ return SaveAppearanceToNotecard(avatarId, notecardName);
+ }
+
+ protected LSL_Key SaveAppearanceToNotecard(ScenePresence sp, string notecardName)
{
IAvatarFactory appearanceModule = World.RequestModuleInterface();
if (appearanceModule != null)
{
- appearanceModule.SaveBakedTextures(m_host.OwnerID);
- ScenePresence sp = m_host.ParentGroup.Scene.GetScenePresence(m_host.OwnerID);
+ appearanceModule.SaveBakedTextures(sp.UUID);
OSDMap appearancePacked = sp.Appearance.Pack();
TaskInventoryItem item
@@ -2293,6 +2301,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return new LSL_Key(UUID.Zero.ToString());
}
}
+
+ protected LSL_Key SaveAppearanceToNotecard(UUID avatarId, string notecardName)
+ {
+ ScenePresence sp = World.GetScenePresence(avatarId);
+
+ if (sp == null || sp.IsChildAgent)
+ return new LSL_Key(UUID.Zero.ToString());
+
+ return SaveAppearanceToNotecard(sp, notecardName);
+ }
+
+ protected LSL_Key SaveAppearanceToNotecard(LSL_Key rawAvatarId, string notecardName)
+ {
+ UUID avatarId;
+ if (!UUID.TryParse(rawAvatarId, out avatarId))
+ return new LSL_Key(UUID.Zero.ToString());
+
+ return SaveAppearanceToNotecard(avatarId, notecardName);
+ }
///
/// Get current region's map texture UUID
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index f4a618b..88e1f15 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -168,7 +168,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
-
key osNpcCreate(string user, string name, vector position, key cloneFrom);
LSL_Key osNpcSaveAppearance(key npc, string notecardName);
void osNpcLoadAppearance(key npc, string notecardNameOrUuid);
@@ -179,6 +178,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osNpcRemove(key npc);
LSL_Key osOwnerSaveAppearance(string notecardName);
+ LSL_Key osAgentSaveAppearance(key agentId, string notecardName);
key osGetMapTexture();
key osGetRegionMapTexture(string regionName);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 84d61f4..4701736 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -523,6 +523,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osOwnerSaveAppearance(notecardName);
}
+ public LSL_Key osAgentSaveAppearance(LSL_Key agentId, string notecardName)
+ {
+ return m_OSSL_Functions.osAgentSaveAppearance(agentId, notecardName);
+ }
+
public OSSLPrim Prim;
[Serializable]
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 7f778d7..85cf507 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -184,5 +184,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
Assert.That(savedAppearance.AvatarHeight, Is.EqualTo(sp.Appearance.AvatarHeight));
}
+
+ [Test]
+ public void TestOsAgentSaveAppearance()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ UUID ownerId = TestHelpers.ParseTail(0x1);
+ UUID nonOwnerId = TestHelpers.ParseTail(0x2);
+ float newHeight = 1.9f;
+
+ ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, nonOwnerId);
+ sp.Appearance.AvatarHeight = newHeight;
+ SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, ownerId);
+ SceneObjectPart part = so.RootPart;
+ m_scene.AddSceneObject(so);
+
+ OSSL_Api osslApi = new OSSL_Api();
+ osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+
+ string notecardName = "appearanceNc";
+
+ osslApi.osAgentSaveAppearance(new LSL_Types.LSLString(nonOwnerId.ToString()), notecardName);
+
+ IList items = part.Inventory.GetInventoryItems(notecardName);
+ Assert.That(items.Count, Is.EqualTo(1));
+
+ TaskInventoryItem ncItem = items[0];
+ Assert.That(ncItem.Name, Is.EqualTo(notecardName));
+
+ AssetBase ncAsset = m_scene.AssetService.Get(ncItem.AssetID.ToString());
+ Assert.That(ncAsset, Is.Not.Null);
+
+ AssetNotecard anc = new AssetNotecard(UUID.Zero, ncAsset.Data);
+ anc.Decode();
+ OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(anc.BodyText);
+ AvatarAppearance savedAppearance = new AvatarAppearance();
+ savedAppearance.Unpack(appearanceOsd);
+
+ Assert.That(savedAppearance.AvatarHeight, Is.EqualTo(sp.Appearance.AvatarHeight));
+ }
}
}
\ No newline at end of file
--
cgit v1.1
From a21e98ae1a3e2f570cc119e020d4d4ea111e0ad2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 23:28:14 +0100
Subject: implement osNpcGetRot() and osNpcSetRot()
Rotation works if done around the z axis. Anything else leads to random results.
---
.../Shared/Api/Implementation/LSL_Api.cs | 3 +-
.../Shared/Api/Implementation/OSSL_Api.cs | 57 ++++++++++++++++++++--
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 10 ++++
4 files changed, 67 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 86ee28a..8a281d4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -369,7 +369,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
// convert a LSL_Rotation to a Quaternion
- protected Quaternion Rot2Quaternion(LSL_Rotation r)
+ public static Quaternion Rot2Quaternion(LSL_Rotation r)
{
Quaternion q = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
q.Normalize();
@@ -2061,6 +2061,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
return llGetRootRotation();
}
+
m_host.AddScriptLPS(1);
Quaternion q = m_host.GetWorldRotation();
return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 939602a..1874826 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2186,9 +2186,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (npcModule != null)
{
- UUID npcId = new UUID(npc.m_string);
-
- if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+ UUID npcId;
+ if (!UUID.TryParse(npc.m_string, out npcId))
return;
string appearanceSerialized = LoadNotecard(notecardNameOrUuid);
@@ -2210,8 +2209,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
INPCModule module = World.RequestModuleInterface();
if (module != null)
{
+ UUID npcId;
+ if (!UUID.TryParse(npc.m_string, out npcId))
+ return;
+
Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
- module.MoveToTarget(new UUID(npc.m_string), World, pos, false, true);
+ module.MoveToTarget(npcId, World, pos, false, true);
}
}
@@ -2222,6 +2225,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
INPCModule module = World.RequestModuleInterface();
if (module != null)
{
+ UUID npcId;
+ if (!UUID.TryParse(npc.m_string, out npcId))
+ return;
+
Vector3 pos = new Vector3((float)position.x, (float)position.y, (float)position.z);
module.MoveToTarget(
new UUID(npc.m_string),
@@ -2232,6 +2239,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
+ public LSL_Rotation osNpcGetRot(LSL_Key npc)
+ {
+ CheckThreatLevel(ThreatLevel.High, "osNpcGetRot");
+
+ INPCModule npcModule = World.RequestModuleInterface();
+ if (npcModule != null)
+ {
+ UUID npcId;
+ if (!UUID.TryParse(npc.m_string, out npcId))
+ return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W);
+
+ if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+ return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W);
+
+ ScenePresence sp = World.GetScenePresence(npcId);
+ Quaternion rot = sp.Rotation;
+
+ return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
+ }
+
+ return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W);
+ }
+
+ public void osNpcSetRot(LSL_Key npc, LSL_Rotation rotation)
+ {
+ CheckThreatLevel(ThreatLevel.High, "osNpcSetRot");
+
+ INPCModule npcModule = World.RequestModuleInterface();
+ if (npcModule != null)
+ {
+ UUID npcId;
+ if (!UUID.TryParse(npc.m_string, out npcId))
+ return;
+
+ if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+ return;
+
+ ScenePresence sp = World.GetScenePresence(npcId);
+ sp.Rotation = LSL_Api.Rot2Quaternion(rotation);
+ }
+ }
+
public void osNpcStopMoveTo(LSL_Key npc)
{
CheckThreatLevel(ThreatLevel.VeryLow, "osNpcStopMoveTo");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 88e1f15..7c08e84 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -173,6 +173,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osNpcLoadAppearance(key npc, string notecardNameOrUuid);
void osNpcMoveTo(key npc, vector position);
void osNpcMoveToTarget(key npc, vector position, int options);
+ rotation osNpcGetRot(key npc);
+ void osNpcSetRot(LSL_Key npc, rotation rot);
void osNpcStopMoveTo(LSL_Key npc);
void osNpcSay(key npc, string message);
void osNpcRemove(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 4701736..e8e5f52 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -503,6 +503,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcMoveToTarget(npc, position, options);
}
+ public rotation osNpcGetRot(key npc)
+ {
+ return m_OSSL_Functions.osNpcGetRot(npc);
+ }
+
+ public void osNpcSetRot(key npc, rotation rot)
+ {
+ m_OSSL_Functions.osNpcSetRot(npc, rot);
+ }
+
public void osNpcStopMoveTo(LSL_Key npc)
{
m_OSSL_Functions.osNpcStopMoveTo(npc);
--
cgit v1.1
From d23d37d2aa7c5a3d9c6ec1726aef7941d5e52519 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 23:36:22 +0100
Subject: implement osNpcGetPos()
---
.../Shared/Api/Implementation/OSSL_Api.cs | 21 +++++++++++++++++++++
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 +
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +++++
3 files changed, 27 insertions(+)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 1874826..b1066b5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2202,6 +2202,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
+ public LSL_Vector osNpcGetPos(LSL_Key npc)
+ {
+ CheckThreatLevel(ThreatLevel.High, "osNpcGetPos");
+
+ INPCModule npcModule = World.RequestModuleInterface();
+ if (npcModule != null)
+ {
+ UUID npcId;
+ if (!UUID.TryParse(npc.m_string, out npcId))
+ return new LSL_Vector(0, 0, 0);
+
+ if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+ return new LSL_Vector(0, 0, 0);
+
+ Vector3 pos = World.GetScenePresence(npcId).AbsolutePosition;
+ return new LSL_Vector(pos.X, pos.Y, pos.Z);
+ }
+
+ return new LSL_Vector(0, 0, 0);
+ }
+
public void osNpcMoveTo(LSL_Key npc, LSL_Vector position)
{
CheckThreatLevel(ThreatLevel.High, "osNpcMoveTo");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 7c08e84..9f0d07c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -171,6 +171,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
key osNpcCreate(string user, string name, vector position, key cloneFrom);
LSL_Key osNpcSaveAppearance(key npc, string notecardName);
void osNpcLoadAppearance(key npc, string notecardNameOrUuid);
+ vector osNpcGetPos(key npc);
void osNpcMoveTo(key npc, vector position);
void osNpcMoveToTarget(key npc, vector position, int options);
rotation osNpcGetRot(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 e8e5f52..3ccb3f1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -493,6 +493,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcLoadAppearance(npc, notecardNameOrUuid);
}
+ public vector osNpcGetPos(LSL_Key npc)
+ {
+ return m_OSSL_Functions.osNpcGetPos(npc);
+ }
+
public void osNpcMoveTo(key npc, vector position)
{
m_OSSL_Functions.osNpcMoveTo(npc, position);
--
cgit v1.1
From 0a1bbc27d26a430c53e84e22b7aad0df2f1f4a09 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Aug 2011 00:14:06 +0100
Subject: Allow the osNpcCreate() function to accept a notecard name or asset
for initial appearance
---
.../Shared/Api/Implementation/OSSL_Api.cs | 28 ++++++++++++++++++----
.../Shared/Tests/OSSL_ApiAppearanceTest.cs | 4 ++--
2 files changed, 26 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index b1066b5..90c4636 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2130,20 +2130,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, LSL_Key cloneFrom)
{
CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
- //QueueUserWorkItem
INPCModule module = World.RequestModuleInterface();
if (module != null)
{
- ScenePresence clonePresence = World.GetScenePresence(new UUID(cloneFrom.m_string));
- if (clonePresence == null)
+ AvatarAppearance appearance = null;
+
+ UUID cloneId;
+ if (UUID.TryParse(cloneFrom, out cloneId))
+ {
+ ScenePresence clonePresence = World.GetScenePresence(new UUID(cloneFrom.m_string));
+ if (clonePresence != null)
+ appearance = clonePresence.Appearance;
+ }
+
+ if (appearance == null)
+ {
+ string appearanceSerialized = LoadNotecard(cloneFrom.m_string);
+
+ if (appearanceSerialized != null)
+ {
+ OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
+ appearance = new AvatarAppearance();
+ appearance.Unpack(appearanceOsd);
+ }
+ }
+
+ if (appearance == null)
return new LSL_Key(UUID.Zero.ToString());
UUID x = module.CreateNPC(firstname,
lastname,
new Vector3((float) position.x, (float) position.y, (float) position.z),
World,
- clonePresence.Appearance);
+ appearance);
return new LSL_Key(x.ToString());
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 85cf507..7573dff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -78,11 +78,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
///
/// Test creation of an NPC where the appearance data comes from a notecard
///
- //[Test]
+ [Test]
public void TestOsNpcCreateFromNotecard()
{
TestHelpers.InMethod();
- log4net.Config.XmlConfigurator.Configure();
+// log4net.Config.XmlConfigurator.Configure();
// Store an avatar with a different height from default in a notecard.
UUID userId = TestHelpers.ParseTail(0x1);
--
cgit v1.1
From aebd46a4348cf55d25eaa56325940a0f33d8b8fe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Aug 2011 01:32:49 +0100
Subject: rename osNpcStopMoveTo() to osNpcStopMoveToTarget()
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +-
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 90c4636..07473e5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2322,7 +2322,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
- public void osNpcStopMoveTo(LSL_Key npc)
+ public void osNpcStopMoveToTarget(LSL_Key npc)
{
CheckThreatLevel(ThreatLevel.VeryLow, "osNpcStopMoveTo");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 9f0d07c..2ba68ff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osNpcMoveToTarget(key npc, vector position, int options);
rotation osNpcGetRot(key npc);
void osNpcSetRot(LSL_Key npc, rotation rot);
- void osNpcStopMoveTo(LSL_Key npc);
+ void osNpcStopMoveToTarget(LSL_Key npc);
void osNpcSay(key npc, string message);
void osNpcRemove(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 3ccb3f1..140501c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -518,9 +518,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcSetRot(npc, rot);
}
- public void osNpcStopMoveTo(LSL_Key npc)
+ public void osNpcStopMoveToTarget(LSL_Key npc)
{
- m_OSSL_Functions.osNpcStopMoveTo(npc);
+ m_OSSL_Functions.osNpcStopMoveToTarget(npc);
}
public void osNpcSay(key npc, string message)
--
cgit v1.1
From 16ac5413ddb57ac347addebc82d425364a083637 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Aug 2011 01:52:12 +0100
Subject: rename position parameter in osNpcMoveToTarget to target
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++--
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +-
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 07473e5..2e28907 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2259,7 +2259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
- public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector position, int options)
+ public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector target, int options)
{
CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget");
@@ -2270,7 +2270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(npc.m_string, out npcId))
return;
- Vector3 pos = new Vector3((float)position.x, (float)position.y, (float)position.z);
+ Vector3 pos = new Vector3((float)target.x, (float)target.y, (float)target.z);
module.MoveToTarget(
new UUID(npc.m_string),
World,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 2ba68ff..1f3454f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osNpcLoadAppearance(key npc, string notecardNameOrUuid);
vector osNpcGetPos(key npc);
void osNpcMoveTo(key npc, vector position);
- void osNpcMoveToTarget(key npc, vector position, int options);
+ void osNpcMoveToTarget(key npc, vector target, int options);
rotation osNpcGetRot(key npc);
void osNpcSetRot(LSL_Key npc, rotation rot);
void osNpcStopMoveToTarget(LSL_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 140501c..13cf7fa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -503,9 +503,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osNpcMoveTo(npc, position);
}
- public void osNpcMoveToTarget(key npc, vector position, int options)
+ public void osNpcMoveToTarget(key npc, vector target, int options)
{
- m_OSSL_Functions.osNpcMoveToTarget(npc, position, options);
+ m_OSSL_Functions.osNpcMoveToTarget(npc, target, options);
}
public rotation osNpcGetRot(key npc)
--
cgit v1.1
From 76e0afe83f012e451a66a145c50e79c1bd047f37 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Aug 2011 02:46:44 +0100
Subject: tidy up some OSSL NPC parameter names
---
.../Shared/Api/Implementation/OSSL_Api.cs | 42 +++++++++++-----------
.../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 10 +++---
.../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 16 ++++-----
3 files changed, 34 insertions(+), 34 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 2e28907..d791885 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2127,7 +2127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
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");
@@ -2136,17 +2136,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
AvatarAppearance appearance = null;
- UUID cloneId;
- if (UUID.TryParse(cloneFrom, out cloneId))
+ UUID id;
+ if (UUID.TryParse(notecard, out id))
{
- ScenePresence clonePresence = World.GetScenePresence(new UUID(cloneFrom.m_string));
+ ScenePresence clonePresence = World.GetScenePresence(id);
if (clonePresence != null)
appearance = clonePresence.Appearance;
}
if (appearance == null)
{
- string appearanceSerialized = LoadNotecard(cloneFrom.m_string);
+ string appearanceSerialized = LoadNotecard(notecard);
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.
///
///
- /// The name of the notecard to which to save the appearance.
+ /// The name of the notecard to which to save the appearance.
/// The asset ID of the notecard saved.
- public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecardName)
+ public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecard)
{
CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance");
@@ -2192,13 +2192,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
return new LSL_Key(UUID.Zero.ToString());
- return SaveAppearanceToNotecard(npcId, notecardName);
+ return SaveAppearanceToNotecard(npcId, notecard);
}
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");
@@ -2210,7 +2210,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(npc.m_string, out npcId))
return;
- string appearanceSerialized = LoadNotecard(notecardNameOrUuid);
+ string appearanceSerialized = LoadNotecard(notecard);
OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
// OSD a = OSDParser.DeserializeLLSDXml(appearanceSerialized);
// Console.WriteLine("appearanceSerialized {0}", appearanceSerialized);
@@ -2356,23 +2356,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
///
/// Save the current appearance of the script owner permanently to the named notecard.
///
- /// The name of the notecard to which to save the appearance.
+ /// The name of the notecard to which to save the appearance.
/// The asset ID of the notecard saved.
- public LSL_Key osOwnerSaveAppearance(string notecardName)
+ public LSL_Key osOwnerSaveAppearance(string notecard)
{
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");
- 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();
@@ -2382,7 +2382,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
OSDMap appearancePacked = sp.Appearance.Pack();
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());
}
@@ -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);
if (sp == null || sp.IsChildAgent)
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;
if (!UUID.TryParse(rawAvatarId, out avatarId))
return new LSL_Key(UUID.Zero.ToString());
- return SaveAppearanceToNotecard(avatarId, notecardName);
+ return SaveAppearanceToNotecard(avatarId, notecard);
}
///
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 1f3454f..87cfe1a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -168,9 +168,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
- key osNpcCreate(string user, string name, vector position, key cloneFrom);
- LSL_Key osNpcSaveAppearance(key npc, string notecardName);
- void osNpcLoadAppearance(key npc, string notecardNameOrUuid);
+ key osNpcCreate(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);
void osNpcMoveTo(key npc, vector position);
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 osNpcRemove(key npc);
- LSL_Key osOwnerSaveAppearance(string notecardName);
- LSL_Key osAgentSaveAppearance(key agentId, string notecardName);
+ LSL_Key osOwnerSaveAppearance(string notecard);
+ LSL_Key osAgentSaveAppearance(key agentId, string notecard);
key osGetMapTexture();
key osGetRegionMapTexture(string regionName);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 13cf7fa..bbc8cc6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -483,14 +483,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
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)
@@ -533,14 +533,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
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;
--
cgit v1.1
From b80dfb6572438cb583e95884c0f607342f0c88d4 Mon Sep 17 00:00:00 2001
From: Micheil Merlin
Date: Fri, 12 Aug 2011 21:09:01 -0500
Subject: llGetPrimitiveParams fix prim hollow/hole shape value
---
.../Shared/Api/Implementation/LSL_Api.cs | 6 +-
.../ScriptEngine/Shared/Tests/LSL_ApiTest.cs | 175 +++++++++++++++++++++
2 files changed, 178 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8a281d4..c84afee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7650,7 +7650,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.PRIM_TYPE_BOX:
case ScriptBaseClass.PRIM_TYPE_CYLINDER:
case ScriptBaseClass.PRIM_TYPE_PRISM:
- res.Add(new LSL_Integer(Shape.ProfileCurve));
+ res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0); // Isolate hole shape nibble.
res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7659,7 +7659,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break;
case ScriptBaseClass.PRIM_TYPE_SPHERE:
- res.Add(new LSL_Integer(Shape.ProfileCurve));
+ res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0); // Isolate hole shape nibble.
res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7675,7 +7675,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case ScriptBaseClass.PRIM_TYPE_TUBE:
case ScriptBaseClass.PRIM_TYPE_TORUS:
// holeshape
- res.Add(new LSL_Integer(Shape.ProfileCurve));
+ res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0); // Isolate hole shape nibble.
// cut
res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 3f37ec7..623c82d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -27,11 +27,13 @@
using System.Collections.Generic;
using NUnit.Framework;
+using OpenSim.Framework;
using OpenSim.Tests.Common;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.Framework.Scenes;
using Nini.Config;
using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
using OpenMetaverse;
using System;
using OpenSim.Tests.Common.Mock;
@@ -47,6 +49,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
private const double ANGLE_ACCURACY_IN_RADIANS = 1E-6;
private const double VECTOR_COMPONENT_ACCURACY = 0.0000005d;
+ private const double FLOAT_ACCURACY = 0.00005d;
private LSL_Api m_lslApi;
[SetUp]
@@ -166,6 +169,178 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
}
[Test]
+ // llSetPrimitiveParams and llGetPrimitiveParams test.
+ public void TestllSetPrimitiveParams()
+ {
+ // Create Prim1.
+ Scene scene = SceneHelpers.SetupScene();
+ string obj1Name = "Prim1";
+ UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
+ SceneObjectPart part1 =
+ new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default,
+ Vector3.Zero, Quaternion.Identity,
+ Vector3.Zero) { Name = obj1Name, UUID = objUuid };
+ Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
+
+ // Test a sphere.
+ CheckllSetPrimitiveParams(
+ "test 1", // Prim test identification string
+ new LSL_Types.Vector3(6.0d, 9.9d, 9.9d), // Prim size
+ ScriptBaseClass.PRIM_TYPE_SPHERE, // Prim type
+ ScriptBaseClass.PRIM_HOLE_DEFAULT, // Prim hole type
+ new LSL_Types.Vector3(0.0d, 0.075d, 0.0d), // Prim cut
+ 0.80d, // Prim hollow
+ new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim twist
+ new LSL_Types.Vector3(0.32d, 0.76d, 0.0d)); // Prim dimple
+
+ // Test a prism.
+ CheckllSetPrimitiveParams(
+ "test 2", // Prim test identification string
+ new LSL_Types.Vector3(3.5d, 3.5d, 3.5d), // Prim size
+ ScriptBaseClass.PRIM_TYPE_PRISM, // Prim type
+ ScriptBaseClass.PRIM_HOLE_CIRCLE, // Prim hole type
+ new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
+ 0.90d, // Prim hollow
+ new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim twist
+ new LSL_Types.Vector3(2.0d, 1.0d, 0.0d), // Prim taper
+ new LSL_Types.Vector3(0.0d, 0.0d, 0.0d)); // Prim shear
+
+ // Test a box.
+ CheckllSetPrimitiveParams(
+ "test 3", // Prim test identification string
+ new LSL_Types.Vector3(3.5d, 3.5d, 3.5d), // Prim size
+ ScriptBaseClass.PRIM_TYPE_BOX, // Prim type
+ ScriptBaseClass.PRIM_HOLE_TRIANGLE, // Prim hole type
+ new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
+ 0.90d, // Prim hollow
+ new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist
+ new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper
+ new LSL_Types.Vector3(0.0d, 0.0d, 0.0d)); // Prim shear
+
+ // Test a tube.
+ CheckllSetPrimitiveParams(
+ "test 4", // Prim test identification string
+ new LSL_Types.Vector3(4.2d, 4.2d, 4.2d), // Prim size
+ ScriptBaseClass.PRIM_TYPE_TUBE, // Prim type
+ ScriptBaseClass.PRIM_HOLE_SQUARE, // Prim hole type
+ new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
+ 0.00d, // Prim hollow
+ new LSL_Types.Vector3(1.0d, -1.0d, 0.0d), // Prim twist
+ new LSL_Types.Vector3(1.0d, 0.5d, 0.0d), // Prim hole size
+ new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
+ new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim profile cut
+ new LSL_Types.Vector3(-1.0d, 1.0d, 0.0d), // Prim taper
+ 1.0d, // Prim revolutions
+ 1.0d, // Prim radius
+ 0.0d); // Prim skew
+ }
+
+ // Set prim params for a box, cylinder or prism and check results.
+ public void CheckllSetPrimitiveParams(string primTest,
+ LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+ double primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primTaper, LSL_Types.Vector3 primShear)
+ {
+ // Set the prim params.
+ m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+ ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+ primCut, primHollow, primTwist, primTaper, primShear));
+
+ // Get params for prim to validate settings.
+ LSL_Types.list primParams =
+ m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+ // Validate settings.
+ CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
+ Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
+ "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+ Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
+ "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+ CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
+ Assert.AreEqual(primHollow, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
+ "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+ CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
+ CheckllSetPrimitiveParamsVector(primTaper, m_lslApi.llList2Vector(primParams, 6), primTest + " prim taper");
+ CheckllSetPrimitiveParamsVector(primShear, m_lslApi.llList2Vector(primParams, 7), primTest + " prim shear");
+ }
+
+ // Set prim params for a sphere and check results.
+ public void CheckllSetPrimitiveParams(string primTest,
+ LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+ double primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primDimple)
+ {
+ // Set the prim params.
+ m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+ ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+ primCut, primHollow, primTwist, primDimple));
+
+ // Get params for prim to validate settings.
+ LSL_Types.list primParams =
+ m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+ // Validate settings.
+ CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
+ Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
+ "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+ Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
+ "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+ CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
+ Assert.AreEqual(primHollow, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
+ "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+ CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
+ CheckllSetPrimitiveParamsVector(primDimple, m_lslApi.llList2Vector(primParams, 6), primTest + " prim dimple");
+ }
+
+ // Set prim params for a torus, tube or ring and check results.
+ public void CheckllSetPrimitiveParams(string primTest,
+ LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+ double primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primHoleSize,
+ LSL_Types.Vector3 primShear, LSL_Types.Vector3 primProfCut, LSL_Types.Vector3 primTaper,
+ double primRev, double primRadius, double primSkew)
+ {
+ // Set the prim params.
+ m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+ ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+ primCut, primHollow, primTwist, primHoleSize, primShear, primProfCut,
+ primTaper, primRev, primRadius, primSkew));
+
+ // Get params for prim to validate settings.
+ LSL_Types.list primParams =
+ m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+ // Valdate settings.
+ CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
+ Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
+ "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+ Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
+ "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+ CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
+ Assert.AreEqual(primHollow, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
+ "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+ CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
+ CheckllSetPrimitiveParamsVector(primHoleSize, m_lslApi.llList2Vector(primParams, 6), primTest + " prim hole size");
+ CheckllSetPrimitiveParamsVector(primShear, m_lslApi.llList2Vector(primParams, 7), primTest + " prim shear");
+ CheckllSetPrimitiveParamsVector(primProfCut, m_lslApi.llList2Vector(primParams, 8), primTest + " prim profile cut");
+ CheckllSetPrimitiveParamsVector(primTaper, m_lslApi.llList2Vector(primParams, 9), primTest + " prim taper");
+ Assert.AreEqual(primRev, m_lslApi.llList2Float(primParams, 10), FLOAT_ACCURACY,
+ "TestllSetPrimitiveParams " + primTest + " prim revolution fail");
+ Assert.AreEqual(primRadius, m_lslApi.llList2Float(primParams, 11), FLOAT_ACCURACY,
+ "TestllSetPrimitiveParams " + primTest + " prim radius fail");
+ Assert.AreEqual(primSkew, m_lslApi.llList2Float(primParams, 12), FLOAT_ACCURACY,
+ "TestllSetPrimitiveParams " + primTest + " prim skew fail");
+ }
+
+ public void CheckllSetPrimitiveParamsVector(LSL_Types.Vector3 vecCheck, LSL_Types.Vector3 vecReturned, string msg)
+ {
+ // Check each vector component against expected result.
+ Assert.AreEqual(vecCheck.x, vecReturned.x, VECTOR_COMPONENT_ACCURACY,
+ "TestllSetPrimitiveParams " + msg + " vector check fail on x component");
+ Assert.AreEqual(vecCheck.y, vecReturned.y, VECTOR_COMPONENT_ACCURACY,
+ "TestllSetPrimitiveParams " + msg + " vector check fail on y component");
+ Assert.AreEqual(vecCheck.z, vecReturned.z, VECTOR_COMPONENT_ACCURACY,
+ "TestllSetPrimitiveParams " + msg + " vector check fail on z component");
+ }
+
+ [Test]
// llVecNorm test.
public void TestllVecNorm()
{
--
cgit v1.1