aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-12-14 00:40:56 +0000
committerMelanie2009-12-14 00:40:56 +0000
commit824d7190c2a5520f1cf6f3d24585b8c47c841e55 (patch)
tree0814d0228121249b7f2a33658180a0a446d13f51 /OpenSim/Framework
parentAnd reverse (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.zip
opensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.gz
opensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.bz2
opensim-SC_OLD-824d7190c2a5520f1cf6f3d24585b8c47c841e55.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Util.cs20
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index b5e2872..58a0d77 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1007,6 +1007,26 @@ namespace OpenSim.Framework
1007 return os; 1007 return os;
1008 } 1008 }
1009 1009
1010 public static string GetRuntimeInformation()
1011 {
1012 string ru = String.Empty;
1013
1014 if (Environment.OSVersion.Platform == PlatformID.Unix)
1015 ru = "Unix/Mono";
1016 else
1017 if (Environment.OSVersion.Platform == PlatformID.MacOSX)
1018 ru = "OSX/Mono";
1019 else
1020 {
1021 if (Type.GetType("Mono.Runtime") != null)
1022 ru = "Win/Mono";
1023 else
1024 ru = "Win/.NET";
1025 }
1026
1027 return ru;
1028 }
1029
1010 /// <summary> 1030 /// <summary>
1011 /// Is the given string a UUID? 1031 /// Is the given string a UUID?
1012 /// </summary> 1032 /// </summary>