diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Util.cs | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs index 0c9a290..dac2545 100644 --- a/OpenSim/Framework/General/Util.cs +++ b/OpenSim/Framework/General/Util.cs | |||
@@ -44,7 +44,6 @@ namespace OpenSim.Framework.Utilities | |||
44 | private static object XferLock = new object(); | 44 | private static object XferLock = new object(); |
45 | private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>(); | 45 | private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>(); |
46 | 46 | ||
47 | private static bool m_useExecutePath; | ||
48 | 47 | ||
49 | public static ulong UIntsToLong(uint X, uint Y) | 48 | public static ulong UIntsToLong(uint X, uint Y) |
50 | { | 49 | { |
@@ -298,21 +297,12 @@ namespace OpenSim.Framework.Utilities | |||
298 | // directory locations | 297 | // directory locations |
299 | // | 298 | // |
300 | 299 | ||
301 | public static void changeUseExecutePathSetting(bool setting) | ||
302 | { | ||
303 | m_useExecutePath = setting; | ||
304 | } | ||
305 | |||
306 | public static string homeDir() | 300 | public static string homeDir() |
307 | { | 301 | { |
308 | string temp; | 302 | string temp; |
309 | // string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal)); | 303 | // string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal)); |
310 | // temp = Path.Combine(personal,".OpenSim"); | 304 | // temp = Path.Combine(personal,".OpenSim"); |
311 | temp="."; | 305 | temp="."; |
312 | if (m_useExecutePath) | ||
313 | { | ||
314 | temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); | ||
315 | } | ||
316 | return temp; | 306 | return temp; |
317 | } | 307 | } |
318 | 308 | ||
@@ -320,10 +310,6 @@ namespace OpenSim.Framework.Utilities | |||
320 | { | 310 | { |
321 | string temp; | 311 | string temp; |
322 | temp = "."; | 312 | temp = "."; |
323 | if (m_useExecutePath) | ||
324 | { | ||
325 | temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); | ||
326 | } | ||
327 | return temp; | 313 | return temp; |
328 | } | 314 | } |
329 | 315 | ||
@@ -331,10 +317,6 @@ namespace OpenSim.Framework.Utilities | |||
331 | { | 317 | { |
332 | string temp; | 318 | string temp; |
333 | temp = "."; | 319 | temp = "."; |
334 | if (m_useExecutePath) | ||
335 | { | ||
336 | temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); | ||
337 | } | ||
338 | return temp; | 320 | return temp; |
339 | } | 321 | } |
340 | 322 | ||
@@ -342,10 +324,6 @@ namespace OpenSim.Framework.Utilities | |||
342 | { | 324 | { |
343 | string temp; | 325 | string temp; |
344 | temp = "."; | 326 | temp = "."; |
345 | if (m_useExecutePath) | ||
346 | { | ||
347 | temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); | ||
348 | } | ||
349 | return temp; | 327 | return temp; |
350 | } | 328 | } |
351 | 329 | ||