aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs16
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ac1145f..2396519 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -26,24 +26,26 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Data; 29using System.Data;
31using System.IO; 30using System.IO;
32using System.Net; 31using System.Net;
33using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Reflection;
34using System.Runtime.Serialization;
35using System.Runtime.Serialization.Formatters.Binary;
34using System.Security.Cryptography; 36using System.Security.Cryptography;
35using System.Text; 37using System.Text;
38using System.Text.RegularExpressions;
36using libsecondlife; 39using libsecondlife;
40using log4net;
37using Nini.Config; 41using Nini.Config;
38using Nwc.XmlRpc; 42using Nwc.XmlRpc;
39 43
40using System.Runtime.Serialization;
41using System.Runtime.Serialization.Formatters.Binary;
42namespace OpenSim.Framework 44namespace OpenSim.Framework
43{ 45{
44 public class Util 46 public class Util
45 { 47 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 49
48 private static Random randomClass = new Random(); 50 private static Random randomClass = new Random();
49 private static uint nextXferID = 5000; 51 private static uint nextXferID = 5000;
@@ -385,7 +387,7 @@ namespace OpenSim.Framework
385 /// <returns>safe path</returns> 387 /// <returns>safe path</returns>
386 public static string safePath(string path) 388 public static string safePath(string path)
387 { 389 {
388 return System.Text.RegularExpressions.Regex.Replace(path, @regexInvalidPathChars, string.Empty); 390 return Regex.Replace(path, @regexInvalidPathChars, string.Empty);
389 } 391 }
390 392
391 /// <summary> 393 /// <summary>
@@ -395,7 +397,7 @@ namespace OpenSim.Framework
395 /// <returns>safe filename</returns> 397 /// <returns>safe filename</returns>
396 public static string safeFileName(string filename) 398 public static string safeFileName(string filename)
397 { 399 {
398 return System.Text.RegularExpressions.Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ; 400 return Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ;
399 } 401 }
400 402
401 // 403 //
@@ -520,7 +522,7 @@ namespace OpenSim.Framework
520 sr.Close(); 522 sr.Close();
521 return issue; 523 return issue;
522 } 524 }
523 catch (System.Exception) 525 catch (Exception)
524 { 526 {
525 return ""; 527 return "";
526 } 528 }