aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2013-07-12 12:54:29 -0700
committerDiva Canto2013-07-12 12:54:29 -0700
commit3d700bb42c1c376c94146b993b495ebae206ceff (patch)
tree620dcc1ab30a37b1fe308dfaf5a582d7fa8e296b /OpenSim/Framework
parentChanged UploadBakedTextureModule so that it uses the same pattern as the othe... (diff)
parentEnhance NullEstateData to remember stored estate values and return (diff)
downloadopensim-SC_OLD-3d700bb42c1c376c94146b993b495ebae206ceff.zip
opensim-SC_OLD-3d700bb42c1c376c94146b993b495ebae206ceff.tar.gz
opensim-SC_OLD-3d700bb42c1c376c94146b993b495ebae206ceff.tar.bz2
opensim-SC_OLD-3d700bb42c1c376c94146b993b495ebae206ceff.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Util.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index ba6cc75..cafe103 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -141,6 +141,11 @@ namespace OpenSim.Framework
141 public static FireAndForgetMethod DefaultFireAndForgetMethod = FireAndForgetMethod.SmartThreadPool; 141 public static FireAndForgetMethod DefaultFireAndForgetMethod = FireAndForgetMethod.SmartThreadPool;
142 public static FireAndForgetMethod FireAndForgetMethod = DefaultFireAndForgetMethod; 142 public static FireAndForgetMethod FireAndForgetMethod = DefaultFireAndForgetMethod;
143 143
144 public static bool IsPlatformMono
145 {
146 get { return Type.GetType("Mono.Runtime") != null; }
147 }
148
144 /// <summary> 149 /// <summary>
145 /// Gets the name of the directory where the current running executable 150 /// Gets the name of the directory where the current running executable
146 /// is located 151 /// is located
@@ -1326,7 +1331,7 @@ namespace OpenSim.Framework
1326 ru = "OSX/Mono"; 1331 ru = "OSX/Mono";
1327 else 1332 else
1328 { 1333 {
1329 if (Type.GetType("Mono.Runtime") != null) 1334 if (IsPlatformMono)
1330 ru = "Win/Mono"; 1335 ru = "Win/Mono";
1331 else 1336 else
1332 ru = "Win/.NET"; 1337 ru = "Win/.NET";