From eec3921800e3a19f210c0488d78399c210f9b9d6 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 8 Jan 2018 12:00:21 +0000
Subject: fall back to a obsolete property since several monos in use (include
 our own) do not suporte the proper .net4.0 one

---
 OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs  | 2 +-
 OpenSim/Region/Framework/Scenes/SOPVehicle.cs                         | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs                    | 2 +-
 .../Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | 2 +-
 .../Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs    | 4 ++--
 OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs       | 2 +-
 OpenSim/Region/Framework/Scenes/TerrainChannel.cs                     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index 38ab934..e1f96a2 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             using (XmlTextReader reader = new XmlTextReader(path))
             {
-                reader.DtdProcessing = DtdProcessing.Prohibit;
+                reader.ProhibitDtd = true;
                 reader.XmlResolver = null;
                 XmlDocument doc = new XmlDocument();
                 doc.XmlResolver = null;
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 22734b3..0a1923a 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -593,7 +593,7 @@ namespace OpenSim.Region.Framework.Scenes
             UTF8Encoding enc = new UTF8Encoding();
             MemoryStream ms = new MemoryStream(enc.GetBytes(text));
             XmlTextReader xreader = new XmlTextReader(ms);
-            xreader.DtdProcessing = DtdProcessing.Prohibit;
+            xreader.ProhibitDtd = true;
             xreader.XmlResolver = null;
 
             SOPVehicle v = new SOPVehicle();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 84367df..a3c7dbc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
                 {
-                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
+                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
                     {
                         reader.Read();
                         bool isSingleObject = reader.Name != "CoalescedObject";
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index c3bc4a0..abcd440 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     using (XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.DtdProcessing = DtdProcessing.Prohibit;
+                        reader.ProhibitDtd = true;
                         reader.XmlResolver = null;
 
                         reader.MoveToContent(); // skip possible xml declaration
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index a2d512a..2d8f3cd 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
             using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
             {
-                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, DtdProcessing = DtdProcessing.Prohibit, XmlResolver = null }))
+                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
                 {
                     try
                     {
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     using(XmlTextReader reader = new XmlTextReader(sr))
                     {
-                        reader.DtdProcessing = DtdProcessing.Prohibit;
+                        reader.ProhibitDtd = true;
                         reader.XmlResolver = null;
 
                         sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 977dd73..e486580 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 using(XmlTextReader reader = new XmlTextReader(fileName))
                 {
                     reader.WhitespaceHandling = WhitespaceHandling.None;
-                    reader.DtdProcessing = DtdProcessing.Prohibit;
+                    reader.ProhibitDtd = true;
                     reader.XmlResolver = null;
 
                     doc.Load(reader);
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 1beca04..6ebe897 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 using(XmlTextReader reader = new XmlTextReader(sr))
                 {
-                    reader.DtdProcessing = DtdProcessing.Prohibit;
+                    reader.ProhibitDtd = true;
                     reader.XmlResolver = null;
                     ReadXml(reader);
                 }
-- 
cgit v1.1


From 1a6770191ca47c9f696df57fde34585ac61ff3b8 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 8 Jan 2018 12:30:43 +0000
Subject: test our obsolete jenkins ...

---
 OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index e1f96a2..77edb4c 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             using (XmlTextReader reader = new XmlTextReader(path))
             {
                 reader.ProhibitDtd = true;
-                reader.XmlResolver = null;
+//                reader.XmlResolver = null;
                 XmlDocument doc = new XmlDocument();
                 doc.XmlResolver = null;
 
-- 
cgit v1.1


From e908c0ecadb9d44102ee649c5f9184e6e3034541 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 9 Jan 2018 19:47:10 +0000
Subject: give up on a property that old monos do compile, but then smore ok
 exec

---
 OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs | 2 +-
 OpenSim/Region/Framework/Scenes/SOPVehicle.cs                        | 1 -
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs                   | 2 +-
 OpenSim/Region/Framework/Scenes/TerrainChannel.cs                    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index 77edb4c..2128d58 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             using (XmlTextReader reader = new XmlTextReader(path))
             {
                 reader.ProhibitDtd = true;
-//                reader.XmlResolver = null;
+
                 XmlDocument doc = new XmlDocument();
                 doc.XmlResolver = null;
 
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index 0a1923a..6683614 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -594,7 +594,6 @@ namespace OpenSim.Region.Framework.Scenes
             MemoryStream ms = new MemoryStream(enc.GetBytes(text));
             XmlTextReader xreader = new XmlTextReader(ms);
             xreader.ProhibitDtd = true;
-            xreader.XmlResolver = null;
 
             SOPVehicle v = new SOPVehicle();
             bool error;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a3c7dbc..b3303a0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2389,7 +2389,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
                 {
-                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
+                    using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
                     {
                         reader.Read();
                         bool isSingleObject = reader.Name != "CoalescedObject";
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index 6ebe897..20bad94 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Framework.Scenes
                 using(XmlTextReader reader = new XmlTextReader(sr))
                 {
                     reader.ProhibitDtd = true;
-                    reader.XmlResolver = null;
+
                     ReadXml(reader);
                 }
             }
-- 
cgit v1.1


From 439cbf0d4d4c2402729f0d73c6bbc2bf969a5f9a Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 9 Jan 2018 19:48:13 +0000
Subject: missed a few..

---
 .../Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs  | 1 -
 OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 3 +--
 OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs        | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index abcd440..abcb573 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -134,7 +134,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     using (XmlTextReader reader = new XmlTextReader(sr))
                     {
                         reader.ProhibitDtd = true;
-                        reader.XmlResolver = null;
 
                         reader.MoveToContent(); // skip possible xml declaration
 
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 2d8f3cd..c5a3a22 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             String fixedData = ExternalRepresentationUtils.SanitizeXml(xmlData);
             using (XmlTextReader wrappedReader = new XmlTextReader(fixedData, XmlNodeType.Element, null))
             {
-                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true, XmlResolver = null }))
+                using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true }))
                 {
                     try
                     {
@@ -273,7 +273,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     using(XmlTextReader reader = new XmlTextReader(sr))
                     {
                         reader.ProhibitDtd = true;
-                        reader.XmlResolver = null;
 
                         sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
                     }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index e486580..0ebc645 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -58,7 +58,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     reader.WhitespaceHandling = WhitespaceHandling.None;
                     reader.ProhibitDtd = true;
-                    reader.XmlResolver = null;
 
                     doc.Load(reader);
                 }
-- 
cgit v1.1


From d39bf37926263655fa4a3f7201ffb5e7cbd5e020 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 16 Jan 2018 17:16:40 +0000
Subject:  do not timeout BackupWorker threads

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c223aae..6497444 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1943,7 +1943,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (!m_backingup)
             {
-                WorkManager.RunInThreadPool(o => Backup(false), null, string.Format("BackupWorker ({0})", Name));
+                WorkManager.RunInThreadPool(o => Backup(false), null, string.Format("BackupWorker ({0})", Name, false));
             }
         }
 
-- 
cgit v1.1