diff options
author | Melanie | 2010-08-30 02:30:28 +0100 |
---|---|---|
committer | Melanie | 2010-08-30 02:30:28 +0100 |
commit | 79bfa275da6b8be03678bfa284bd205410296b6a (patch) | |
tree | 1ce2f9f2da9bb0e3a8f5628d54f44e45bfc33044 /OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |
parent | Remove CRLF endings (diff) | |
parent | Fix a casting operation to use ToString() (diff) | |
download | opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.zip opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.gz opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.bz2 opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/DataSnapshot/ObjectSnapshot.cs')
-rw-r--r-- | OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index c489972..3c39f9e 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |||
@@ -142,9 +142,18 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
142 | node.InnerText = m_scene.RegionInfo.RegionSettings.RegionUUID.ToString(); | 142 | node.InnerText = m_scene.RegionInfo.RegionSettings.RegionUUID.ToString(); |
143 | xmlobject.AppendChild(node); | 143 | xmlobject.AppendChild(node); |
144 | 144 | ||
145 | node = nodeFactory.CreateNode(XmlNodeType.Element, "parceluuid", ""); | 145 | if (land != null && land.LandData != null) |
146 | node.InnerText = land.LandData.GlobalID.ToString(); | 146 | { |
147 | xmlobject.AppendChild(node); | 147 | node = nodeFactory.CreateNode(XmlNodeType.Element, "parceluuid", ""); |
148 | node.InnerText = land.LandData.GlobalID.ToString(); | ||
149 | xmlobject.AppendChild(node); | ||
150 | } | ||
151 | else | ||
152 | { | ||
153 | // Something is wrong with this object. Let's not list it. | ||
154 | m_log.WarnFormat("[DATASNAPSHOT]: Bad data for object {0} ({1}) in region {2}", obj.Name, obj.UUID, m_scene.RegionInfo.RegionName); | ||
155 | continue; | ||
156 | } | ||
148 | 157 | ||
149 | node = nodeFactory.CreateNode(XmlNodeType.Element, "location", ""); | 158 | node = nodeFactory.CreateNode(XmlNodeType.Element, "location", ""); |
150 | Vector3 loc = obj.AbsolutePosition; | 159 | Vector3 loc = obj.AbsolutePosition; |