diff options
| author | root | 2009-11-26 20:41:38 +0100 |
|---|---|---|
| committer | root | 2009-11-26 20:41:38 +0100 |
| commit | 2c3f6aaa878b5458eeeab8544226ff53b7172f5a (patch) | |
| tree | 48941505962693508016fafb479c2baaf1b3568f /OpenSim/Framework/Util.cs | |
| parent | First attempt at mult-sit on large single prims. (diff) | |
| parent | Remove OS version crap from about dialog (diff) | |
| download | opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.zip opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.gz opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.bz2 opensim-SC_OLD-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.xz | |
Merge branch 'careminster' into tests
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 87ba5a8..c052745 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -990,19 +990,19 @@ namespace OpenSim.Framework | |||
| 990 | { | 990 | { |
| 991 | string os = String.Empty; | 991 | string os = String.Empty; |
| 992 | 992 | ||
| 993 | if (Environment.OSVersion.Platform != PlatformID.Unix) | 993 | // if (Environment.OSVersion.Platform != PlatformID.Unix) |
| 994 | { | 994 | // { |
| 995 | os = Environment.OSVersion.ToString(); | 995 | // os = Environment.OSVersion.ToString(); |
| 996 | } | 996 | // } |
| 997 | else | 997 | // else |
| 998 | { | 998 | // { |
| 999 | os = ReadEtcIssue(); | 999 | // os = ReadEtcIssue(); |
| 1000 | } | 1000 | // } |
| 1001 | 1001 | // | |
| 1002 | if (os.Length > 45) | 1002 | // if (os.Length > 45) |
| 1003 | { | 1003 | // { |
| 1004 | os = os.Substring(0, 45); | 1004 | // os = os.Substring(0, 45); |
| 1005 | } | 1005 | // } |
| 1006 | 1006 | ||
| 1007 | return os; | 1007 | return os; |
| 1008 | } | 1008 | } |