*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.

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
         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;
         }