diff options
| author | Melanie | 2009-12-14 00:32:00 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-14 00:32:00 +0000 |
| commit | 0813dc8c1d8ff6a2de04dc48e991e803eb3df260 (patch) | |
| tree | 3aa288c205e41277ef927eac8605dc70845d8065 /OpenSim/Framework | |
| parent | Add an option to exit an instance rather than restarting a region within it (diff) | |
| parent | Tweaking the ModifyLand packet to be async. Advice from Adam (diff) | |
| download | opensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.zip opensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.gz opensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.bz2 opensim-SC_OLD-0813dc8c1d8ff6a2de04dc48e991e803eb3df260.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 1112497..7215086 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> |