Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 25 insertions, 25 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs b/OpenSim/Framework/ThreadSafeRandom.cs
index 283fa2e..58853e6 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs
+++ b/OpenSim/Framework/ThreadSafeRandom.cs
@@ -25,48 +25,48 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.IO;
-using System.Text;
-using System.Xml;
+using System;
 
-namespace OpenSim.ApplicationPlugins.Rest
+namespace OpenSim.Framework
 {
-    public class RestXmlWriter: XmlTextWriter
+    /// <summary>
+    /// A thread-safe Random since the .NET version is not.
+    /// See http://msdn.microsoft.com/en-us/library/system.random%28v=vs.100%29.aspx
+    /// </summary>
+    public class ThreadSafeRandom : Random
     {
-        private StringWriter m_sw = null;
+        public ThreadSafeRandom() : base() {}
 
-        public RestXmlWriter(StringWriter sw) : base(sw)
-        {
-            m_sw = sw;
-            Formatting = Formatting.Indented;
-        }
-
-        public RestXmlWriter(TextWriter textWriter) : base(textWriter)
-        {
-        }
+        public ThreadSafeRandom(int seed): base (seed) {}
 
-        public RestXmlWriter(Stream stream)
-            : this(stream, Encoding.UTF8)
+        public override int Next()
         {
+            lock (this)
+                return base.Next();
         }
 
-        public RestXmlWriter(Stream stream, Encoding enc) : base(stream, enc)
+        public override int Next(int maxValue)
         {
+            lock (this)
+                return base.Next(maxValue);
         }
 
-        public override void WriteStartDocument()
+        public override int Next(int minValue, int maxValue)
         {
+            lock (this)
+                return base.Next(minValue, maxValue);
         }
 
-        public override void WriteStartDocument(bool standalone)
+        public override void NextBytes(byte[] buffer)
         {
+            lock (this)
+                base.NextBytes(buffer);
         }
 
-        public override string ToString()
+        public override double NextDouble()
         {
-            Flush();
-            Close();
-            return m_sw.ToString();
+            lock (this)
+                return base.NextDouble();
         }
     }
-}
+}
\ No newline at end of file