ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Replaced -useexecutepath with an updated -inifile extension. You can now specify either a filename (will use the default config path, or you can specify a full path.

Browse Source
This commit is contained in:
mingchen
2007-10-28 03:41:34 +00:00
parent fb6aa6eafc
commit d56da1c831
2 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Framework/General/Util.cs
View File

@@ -44,7 +44,6 @@ namespace OpenSim.Framework.Utilities
private static object XferLock = new object();
private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>();
private static bool m_useExecutePath;
public static ulong UIntsToLong(uint X, uint Y)
{
@@ -298,21 +297,12 @@ namespace OpenSim.Framework.Utilities
// directory locations
//
public static void changeUseExecutePathSetting(bool setting)
{
m_useExecutePath = setting;
}
public static string homeDir()
{
string temp;
// string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
// temp = Path.Combine(personal,".OpenSim");
temp=".";
if (m_useExecutePath)
{
temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
}
return temp;
}
@@ -320,10 +310,6 @@ namespace OpenSim.Framework.Utilities
{
string temp;
temp = ".";
if (m_useExecutePath)
{
temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
}
return temp;
}
@@ -331,10 +317,6 @@ namespace OpenSim.Framework.Utilities
{
string temp;
temp = ".";
if (m_useExecutePath)
{
temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
}
return temp;
}
@@ -342,10 +324,6 @@ namespace OpenSim.Framework.Utilities
{
string temp;
temp = ".";
if (m_useExecutePath)
{
temp = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
}
return temp;
}