aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-16 18:35:34 +0000
committerJustin Clarke Casey2008-01-16 18:35:34 +0000
commit57519b6dba97d7e7a2de71af9d58c93b4750bde8 (patch)
tree9597647ee1e70e50215b90bb116fede1ca7f8e27 /OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
parentFirst part of changing prim's permission flags to use the correct enum (libsl... (diff)
downloadopensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.zip
opensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.tar.gz
opensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.tar.bz2
opensim-SC-57519b6dba97d7e7a2de71af9d58c93b4750bde8.tar.xz
* Store task inventory when an object is taken into agent inventory
* This means that you can take an object from a region and rez it somewhere else, with its inventory intact. * As for earlier, at this stage only scripts can be placed in inventory * This isn't an efficient implementation, a better one will probably need to come along soonish
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
index 8c4a951..3b4deaf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Environment.Scenes
68 m_regInfo.RegionHandle, aPrimNode.OuterXml); 68 m_regInfo.RegionHandle, aPrimNode.OuterXml);
69 if (newIDS) 69 if (newIDS)
70 { 70 {
71 obj.GenerateNewIDs(); 71 obj.ResetIDs();
72 } 72 }
73 //if we want this to be a import method then we need new uuids for the object to avoid any clashes 73 //if we want this to be a import method then we need new uuids for the object to avoid any clashes
74 //obj.RegenerateFullIDs(); 74 //obj.RegenerateFullIDs();
@@ -189,4 +189,4 @@ namespace OpenSim.Region.Environment.Scenes
189 file.Close(); 189 file.Close();
190 } 190 }
191 } 191 }
192} \ No newline at end of file 192}