aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
authorDr Scofield2008-09-08 10:28:59 +0000
committerDr Scofield2008-09-08 10:28:59 +0000
commit3f9cc28103c632a030ce8ab1cda3659acc1f2e66 (patch)
treee93464d1c0178a58f9f3f716c7bec7c252a07f2f /OpenSim/Region/DataSnapshot
parentUse older ExpectedException attribute format. Previously tests were failing o... (diff)
downloadopensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.zip
opensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.tar.gz
opensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.tar.bz2
opensim-SC_OLD-3f9cc28103c632a030ce8ab1cda3659acc1f2e66.tar.xz
fix: warnings from libomv
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index c23c697..ba797ba 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -105,6 +105,9 @@ namespace OpenSim.Region.DataSnapshot.Providers
105 105
106 m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene"); 106 m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene");
107 107
108 // libomv will complain about PrimFlags.JointWheel
109 // being obsolete, so we...
110 #pragma warning disable 0612
108 if ((obj.RootPart.Flags & PrimFlags.JointWheel) == PrimFlags.JointWheel) { 111 if ((obj.RootPart.Flags & PrimFlags.JointWheel) == PrimFlags.JointWheel) {
109 XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", ""); 112 XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", "");
110 113
@@ -142,6 +145,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
142 } 145 }
143 parent.AppendChild(xmlobject); 146 parent.AppendChild(xmlobject);
144 } 147 }
148 #pragma warning disable 0612
145 } 149 }
146 } 150 }
147 this.Stale = false; 151 this.Stale = false;