diff options
Partial Linking of prim groups should work (its partial as currently only the root prim of the child group will actually get linked, working on linking the rest now).
Multiple prim groups are now stored in the sqlite database and are reloaded correctly.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 1b373aa..c1348c7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1,5 +1,8 @@ | |||
1 | using System.Collections.Generic; | 1 | using System.Collections.Generic; |
2 | using System.Text; | 2 | using System.Text; |
3 | using System.Xml; | ||
4 | using System.Xml.Serialization; | ||
5 | using System.IO; | ||
3 | using System; | 6 | using System; |
4 | using Axiom.Math; | 7 | using Axiom.Math; |
5 | using libsecondlife; | 8 | using libsecondlife; |
@@ -252,6 +255,27 @@ namespace OpenSim.Region.Environment.Scenes | |||
252 | /// <summary> | 255 | /// <summary> |
253 | /// | 256 | /// |
254 | /// </summary> | 257 | /// </summary> |
258 | /// <param name="xmlreader"></param> | ||
259 | /// <returns></returns> | ||
260 | public static SceneObjectPart FromXml(XmlReader xmlReader) | ||
261 | { | ||
262 | XmlSerializer serializer = new XmlSerializer(typeof(SceneObjectPart)); | ||
263 | return (SceneObjectPart)serializer.Deserialize(xmlReader); | ||
264 | } | ||
265 | |||
266 | /// <summary> | ||
267 | /// | ||
268 | /// </summary> | ||
269 | /// <param name="xmlWriter"></param> | ||
270 | public void ToXml(XmlWriter xmlWriter) | ||
271 | { | ||
272 | XmlSerializer serializer = new XmlSerializer(typeof(SceneObjectPart)); | ||
273 | serializer.Serialize(xmlWriter, this); | ||
274 | } | ||
275 | |||
276 | /// <summary> | ||
277 | /// | ||
278 | /// </summary> | ||
255 | public void SetParent(SceneObjectGroup parent) | 279 | public void SetParent(SceneObjectGroup parent) |
256 | { | 280 | { |
257 | m_parentGroup = parent; | 281 | m_parentGroup = parent; |