as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.

Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index e5728fe..8e7b95e 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler;
 using OpenSim.Region.ScriptEngine.Common;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using System.Runtime.Remoting.Lifetime;
 
 namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
@@ -584,7 +584,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
 
         public string llList2Key(List<string> src, int index)
         {
-            //return OpenSim.Framework.Types.ToStringHyphenated(src[index]);
+            //return OpenSim.Framework.ToStringHyphenated(src[index]);
             return src[index].ToString();
         }
 
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
index 9f18f7c..44ed123 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-using OpenSim.Framework.Interfaces;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Scenes.Scripting;
 
 namespace OpenSim.Grid.ScriptEngine.DotNetEngine