diff options
author | Adam Frisby | 2009-12-13 03:04:16 +1100 |
---|---|---|
committer | Adam Frisby | 2009-12-13 03:04:16 +1100 |
commit | 963cf25813ad2bd6dceaa39757391fbf94d6f09e (patch) | |
tree | 80244f3026d0d1c06f4d8e0b496470052353b083 /OpenSim/Framework | |
parent | * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." (diff) | |
download | opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.zip opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.gz opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.bz2 opensim-SC-963cf25813ad2bd6dceaa39757391fbf94d6f09e.tar.xz |
* Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
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> |