aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-11 21:43:35 +0100
committerJustin Clark-Casey (justincc)2012-07-11 21:43:35 +0100
commitfc2456320646df66b95a06d4cd292c3b2385a8ea (patch)
treec1f7eaf2c679a9e7d039240146510ffc6a744cd1 /OpenSim/Region/Framework
parentAdd regression TestRezScriptedAttachmentsFromInventory() though this currentl... (diff)
downloadopensim-SC_OLD-fc2456320646df66b95a06d4cd292c3b2385a8ea.zip
opensim-SC_OLD-fc2456320646df66b95a06d4cd292c3b2385a8ea.tar.gz
opensim-SC_OLD-fc2456320646df66b95a06d4cd292c3b2385a8ea.tar.bz2
opensim-SC_OLD-fc2456320646df66b95a06d4cd292c3b2385a8ea.tar.xz
Add regression TestDetachScriptedAttachmentToInventory()
This currently only does a relatively crude check for a ScriptState node in the serialized xml
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs4
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index ba35a41..351e603 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Interfaces
92 /// <param name="itemID"></param> 92 /// <param name="itemID"></param>
93 /// <param name="AttachmentPt"></param> 93 /// <param name="AttachmentPt"></param>
94 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> 94 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns>
95 ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt); 95 SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
96 96
97 /// <summary> 97 /// <summary>
98 /// Rez multiple attachments from a user's inventory 98 /// Rez multiple attachments from a user's inventory
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index cf2ed1a..821fd81 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1295,6 +1295,10 @@ namespace OpenSim.Region.Framework.Scenes
1295 { 1295 {
1296 if (e != null) 1296 if (e != null)
1297 { 1297 {
1298// m_log.DebugFormat(
1299// "[PRIM INVENTORY]: Getting script state from engine {0} for {1} in part {2} in group {3} in {4}",
1300// e.Name, item.Name, m_part.Name, m_part.ParentGroup.Name, m_part.ParentGroup.Scene.Name);
1301
1298 string n = e.GetXMLState(item.ItemID); 1302 string n = e.GetXMLState(item.ItemID);
1299 if (n != String.Empty) 1303 if (n != String.Empty)
1300 { 1304 {