diff options
| author | meta7 | 2010-08-18 02:53:27 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-18 02:53:27 -0700 |
| commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
| tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Region/DataSnapshot | |
| parent | Fix a nullref exception in the prioritizer (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index 00f6918..c489972 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |||
| @@ -135,7 +135,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
| 135 | xmlobject.AppendChild(node); | 135 | xmlobject.AppendChild(node); |
| 136 | 136 | ||
| 137 | node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", ""); | 137 | node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", ""); |
| 138 | node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags); | 138 | node.InnerText = String.Format("{0:x}", (uint)m_rootPart.Flags); |
| 139 | xmlobject.AppendChild(node); | 139 | xmlobject.AppendChild(node); |
| 140 | 140 | ||
| 141 | node = nodeFactory.CreateNode(XmlNodeType.Element, "regionuuid", ""); | 141 | node = nodeFactory.CreateNode(XmlNodeType.Element, "regionuuid", ""); |