diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Framework/Util.cs | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Util.cs | 16 |
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Data; | 29 | using System.Data; |
31 | using System.IO; | 30 | using System.IO; |
32 | using System.Net; | 31 | using System.Net; |
33 | using System.Net.Sockets; | 32 | using System.Net.Sockets; |
33 | using System.Reflection; | ||
34 | using System.Runtime.Serialization; | ||
35 | using System.Runtime.Serialization.Formatters.Binary; | ||
34 | using System.Security.Cryptography; | 36 | using System.Security.Cryptography; |
35 | using System.Text; | 37 | using System.Text; |
38 | using System.Text.RegularExpressions; | ||
36 | using libsecondlife; | 39 | using libsecondlife; |
40 | using log4net; | ||
37 | using Nini.Config; | 41 | using Nini.Config; |
38 | using Nwc.XmlRpc; | 42 | using Nwc.XmlRpc; |
39 | 43 | ||
40 | using System.Runtime.Serialization; | ||
41 | using System.Runtime.Serialization.Formatters.Binary; | ||
42 | namespace OpenSim.Framework | 44 | namespace 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 | } |