diff options
author | Sean Dague | 2007-10-05 15:45:45 +0000 |
---|---|---|
committer | Sean Dague | 2007-10-05 15:45:45 +0000 |
commit | c3d8f1f4253f72484100394940e62f2912cbc4ff (patch) | |
tree | 8a9f237ed3c1140b4059ec121e0d4ede82eae416 /OpenSim/Framework | |
parent | * So, ok, maybe renaming serialized fields on a friday wasn't the smartest of... (diff) | |
download | opensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.zip opensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.gz opensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.bz2 opensim-SC_OLD-c3d8f1f4253f72484100394940e62f2912cbc4ff.tar.xz |
getting all our line endings consistant again
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/General/Culture.cs | 52 |
2 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 06abb69..fddfb17 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -8,7 +8,7 @@ using Nwc.XmlRpc; | |||
8 | using OpenSim.Framework.Console; | 8 | using OpenSim.Framework.Console; |
9 | using OpenSim.Framework.Interfaces; | 9 | using OpenSim.Framework.Interfaces; |
10 | using OpenSim.Framework.Inventory; | 10 | using OpenSim.Framework.Inventory; |
11 | using OpenSim.Framework.Types; | 11 | using OpenSim.Framework.Types; |
12 | using OpenSim.Framework.Utilities; | 12 | using OpenSim.Framework.Utilities; |
13 | 13 | ||
14 | using OpenSim.Framework.Configuration; | 14 | using OpenSim.Framework.Configuration; |
diff --git a/OpenSim/Framework/General/Culture.cs b/OpenSim/Framework/General/Culture.cs index 8f8561b..9e1c846 100644 --- a/OpenSim/Framework/General/Culture.cs +++ b/OpenSim/Framework/General/Culture.cs | |||
@@ -1,26 +1,26 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Globalization; | 3 | using System.Globalization; |
4 | using System.Text; | 4 | using System.Text; |
5 | using System.Threading; | 5 | using System.Threading; |
6 | 6 | ||
7 | namespace OpenSim.Framework | 7 | namespace OpenSim.Framework |
8 | { | 8 | { |
9 | public class Culture | 9 | public class Culture |
10 | { | 10 | { |
11 | private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true); | 11 | private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true); |
12 | 12 | ||
13 | public static NumberFormatInfo NumberFormatInfo | 13 | public static NumberFormatInfo NumberFormatInfo |
14 | { | 14 | { |
15 | get | 15 | get |
16 | { | 16 | { |
17 | return m_cultureInfo.NumberFormat; | 17 | return m_cultureInfo.NumberFormat; |
18 | } | 18 | } |
19 | } | 19 | } |
20 | 20 | ||
21 | public static void SetCurrentCulture() | 21 | public static void SetCurrentCulture() |
22 | { | 22 | { |
23 | Thread.CurrentThread.CurrentCulture = m_cultureInfo; | 23 | Thread.CurrentThread.CurrentCulture = m_cultureInfo; |
24 | } | 24 | } |
25 | } | 25 | } |
26 | } | 26 | } |