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.

OpenSim/Framework/Communications/Cache/AssetCache.cs

@@ -34,8 +34,7 @@ using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Communications.Cache

OpenSim/Framework/Communications/Cache/AssetServer.cs

@@ -36,8 +36,7 @@ using Nini.Config;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications.Cache
 {

OpenSim/Framework/Communications/Cache/AssetServerBase.cs

@@ -6,8 +6,7 @@ using libsecondlife;
 using Nini.Config;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -28,8 +27,8 @@ namespace OpenSim.Framework.Communications.Cache
         {
             MainLog.Instance.Verbose("SQL ASSET SERVER", "Setting up asset database");
 
-            ForEachDefaultAsset(StoreAsset );
-            ForEachXmlAsset(StoreAsset );
+            ForEachDefaultAsset(StoreAsset);
+            ForEachXmlAsset(StoreAsset);
 
             CommitAssets();
         }
@@ -37,10 +36,11 @@ namespace OpenSim.Framework.Communications.Cache
 
         public AssetServerBase()
         {
+
             OpenSim.Framework.Console.MainLog.Instance.Verbose("ASSETSERVER","Starting asset storage system");
             this._assetRequests = new BlockingQueue<ARequest>();
 
-            this._localAssetServerThread = new Thread( RunRequests );
+            this._localAssetServerThread = new Thread(RunRequests);
             this._localAssetServerThread.IsBackground = true;
             this._localAssetServerThread.Start();
         }
@@ -96,9 +96,9 @@ namespace OpenSim.Framework.Communications.Cache
         }
 
         public virtual void Close()
-    {
-        _localAssetServerThread.Abort( );
-    }
+        {
+            _localAssetServerThread.Abort();
+        }
 
         public void SetServerInfo(string ServerUrl, string ServerKey)
         {
@@ -149,13 +149,13 @@ namespace OpenSim.Framework.Communications.Cache
 
             if (!String.IsNullOrEmpty(filename))
             {
-                MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename );
+                MainLog.Instance.Verbose("ASSETS", "Loading: [{0}][{1}]", name, filename);
 
                 LoadAsset(asset, isImage, filename);
             }
             else
             {
-                MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name );                
+                MainLog.Instance.Verbose("ASSETS", "Instantiated: [{0}]", name);
             }
 
             return asset;
@@ -164,7 +164,7 @@ namespace OpenSim.Framework.Communications.Cache
         public void ForEachXmlAsset(Action<AssetBase> action)
         {
             List<AssetBase> assets = new List<AssetBase>();
-           // System.Console.WriteLine("trying loading asset into database");
+            // System.Console.WriteLine("trying loading asset into database");
             string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml");
             if (File.Exists(filePath))
             {
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Communications.Cache
 
                 for (int i = 0; i < source.Configs.Count; i++)
                 {
-                   // System.Console.WriteLine("loading asset into database");
+                    // System.Console.WriteLine("loading asset into database");
                     string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());
                     string name = source.Configs[i].GetString("name", "");
                     sbyte type = (sbyte)source.Configs[i].GetInt("assetType", 0);
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Communications.Cache
 
                     newAsset.Type = type;
                     newAsset.InvType = invType;
-                   assets.Add(newAsset);
+                    assets.Add(newAsset);
                 }
             }
             assets.ForEach(action);

OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs

@@ -32,8 +32,7 @@ using System.Text;
 using System.IO;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Framework.Data;
 
 namespace OpenSim.Framework.Communications.Cache

OpenSim/Framework/Communications/Cache/AssetTransactions.cs

@@ -34,8 +34,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Region.Capabilities;
 using OpenSim.Framework.Servers;
 

OpenSim/Framework/Communications/Cache/CachedUserInfo.cs

@@ -26,7 +26,7 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications.Cache
 {

OpenSim/Framework/Communications/Cache/GridAssetClient.cs

@@ -36,8 +36,7 @@ using libsecondlife;
 using Nini.Config;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 
 namespace OpenSim.Framework.Communications.Cache

OpenSim/Framework/Communications/Cache/InventoryFolder.cs

@@ -32,8 +32,7 @@ using System.Text;
 using System.IO;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications.Cache
 {

OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs

@@ -31,8 +31,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using Nini.Config;
 
 namespace OpenSim.Framework.Communications.Cache

OpenSim/Framework/Communications/Cache/SQLAssetServer.cs

@@ -33,8 +33,7 @@ using libsecondlife;
 using Nini.Config;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -42,14 +41,12 @@ namespace OpenSim.Framework.Communications.Cache
     {
         public SQLAssetServer(string pluginName)
         {
-           // _assetRequests = new BlockingQueue<ARequest>();
             AddPlugin(pluginName);
         }
 
         public SQLAssetServer(IAssetProvider assetProvider)
         {
             m_assetProviderPlugin = assetProvider;
-           
         }
 
         public void AddPlugin(string FileName)

OpenSim/Framework/Communications/Cache/UserProfileCache.cs

@@ -33,8 +33,8 @@ using System.IO;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+
 
 namespace OpenSim.Framework.Communications.Cache
 {

OpenSim/Framework/Communications/Capabilities/Caps.cs

@@ -33,8 +33,7 @@ using System.IO;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Capabilities
 {

OpenSim/Framework/Communications/CommunicationsManager.cs

@@ -30,9 +30,8 @@ using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Framework.Communications
 {

OpenSim/Framework/Communications/IGridServices.cs

@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Net;
 using libsecondlife;
 
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {

OpenSim/Framework/Communications/IInterRegionCommunications.cs

@@ -26,7 +26,7 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {

OpenSim/Framework/Communications/IInventoryServices.cs

@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {

OpenSim/Framework/Communications/InventoryServiceBase.cs

@@ -33,7 +33,7 @@ using libsecondlife;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Communications
 {

OpenSim/Framework/Communications/LoginService.cs

@@ -34,13 +34,9 @@ using System.Security.Cryptography;
 using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
 
-using OpenSim.Framework.Configuration;
-using InventoryFolder = OpenSim.Framework.Inventory.InventoryFolder;
+using OpenSim.Framework;
+using InventoryFolder = OpenSim.Framework.InventoryFolder;
 
 namespace OpenSim.Framework.UserManagement
 {

OpenSim/Framework/Communications/UserManagerBase.cs

@@ -33,12 +33,11 @@ using System.Reflection;
 using System.Security.Cryptography;
 using libsecondlife;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+
 
 namespace OpenSim.Framework.UserManagement
 {

OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs

@@ -32,7 +32,7 @@ using System.Net;
 using System.IO;
 using System.Text;
 
-using OpenSim.Framework.Configuration.Interfaces;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Configuration.HTTP
 {

OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs

@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Configuration.HTTP
 {

OpenSim/Framework/Configuration/XML/XmlConfiguration.cs

@@ -29,9 +29,7 @@ using System;
 using System.IO;
 using System.Xml;
 
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Configuration.Interfaces;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Configuration
 {

OpenSim/Framework/Data.DB4o/DB4oManager.cs

@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using Db4objects.Db4o;
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Data.DB4o
 {

OpenSim/Framework/Data.DB4o/DB4oUserData.cs

@@ -28,8 +28,8 @@
 using System;
 using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Data.DB4o
 {

OpenSim/Framework/Data.MySQL/MySQLAssetData.cs

@@ -33,7 +33,7 @@ using MySql.Data.MySqlClient;
 using libsecondlife;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Data.MySQL
 {

OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs

@@ -30,7 +30,7 @@ using System.IO;
 using System.Data;
 using System.Collections.Generic;
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using MySql.Data.MySqlClient;
 

OpenSim/Framework/Data.MySQL/MySQLManager.cs

@@ -34,7 +34,7 @@ using libsecondlife;
 
 using MySql.Data.MySqlClient;
 
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Data.MySQL

OpenSim/Framework/Data.MySQL/MySQLUserData.cs

@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Data.MySQL

OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs

@@ -28,12 +28,12 @@
 using System;
 using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using System.Data;
 using System.Data.SqlTypes;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Interfaces;
 
 namespace OpenSim.Framework.Data.SQLite

OpenSim/Framework/Data.SQLite/SQLiteBase.cs

@@ -28,7 +28,7 @@
 using System;
 using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using System.Data;
 using System.Data.SqlTypes;
 using Mono.Data.SqliteClient;

OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs

@@ -32,8 +32,8 @@ using System.Text;
 using System.Reflection;
 
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
 using libsecondlife;
 
 using System.Data;

OpenSim/Framework/Data.SQLite/SQLiteUserData.cs

@@ -28,8 +28,8 @@
 using System;
 using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
 using System.Data;
 using System.Data.SqlTypes;
 using Mono.Data.SqliteClient;

OpenSim/Framework/General/ACL.cs

@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.PolicyManager
+namespace OpenSim.Framework
 {
     // ACL Class
     // Modelled after the structure of the Zend ACL Framework Library

OpenSim/Framework/General/AgentCircuitManager.cs

@@ -28,9 +28,9 @@
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class AgentCircuitManager
     {

OpenSim/Framework/General/AgentCiruitData.cs

@@ -28,7 +28,7 @@
 using libsecondlife;
 using System;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     [Serializable]
     public class AgentCircuitData

OpenSim/Framework/General/AgentInventory.cs

@@ -28,10 +28,10 @@
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework.Inventory
+
+namespace OpenSim.Framework
 {
     public class AgentInventory
     {

OpenSim/Framework/General/AgentWearable.cs

@@ -27,7 +27,7 @@
 */
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class AvatarWearable
     {

OpenSim/Framework/General/AssetBase.cs

@@ -28,7 +28,7 @@
 using System;
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     [Serializable]
     public class AssetBase

OpenSim/Framework/General/AssetConfig.cs

@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.Configuration
+namespace OpenSim.Framework
 {
     /// <summary>
     /// UserConfig -- For User Server Configuration

OpenSim/Framework/General/AssetLandmark.cs

@@ -28,7 +28,7 @@
 using System.Text;
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class AssetLandmark : AssetBase
     {

OpenSim/Framework/General/AssetStorage.cs

@@ -27,7 +27,7 @@
 */
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
 	public class AssetStorage
 	{

OpenSim/Framework/General/AuthenticateResponse.cs

@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework
 {
     public class AuthenticateResponse
     {

OpenSim/Framework/General/BlockingQueue.cs

@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using System.Threading;
 
-namespace OpenSim.Framework.Utilities
+namespace OpenSim.Framework
 {
     public class BlockingQueue<T>
     {

OpenSim/Framework/General/ConfigurationMember.cs

@@ -36,10 +36,9 @@ using System.Net;
 using libsecondlife;
 
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Configuration.Interfaces;
 using System.Globalization;
 
-namespace OpenSim.Framework.Configuration
+namespace OpenSim.Framework
 {
     public class ConfigurationMember
     {

OpenSim/Framework/General/ConfigurationOption.cs

@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.Configuration
+namespace OpenSim.Framework
 {
     public class ConfigurationOption
     {

OpenSim/Framework/General/EstateSettings.cs

@@ -27,11 +27,10 @@
 */
 using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Configuration;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using System.Globalization;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class EstateSettings
     {

OpenSim/Framework/General/GridConfig.cs

@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.Configuration
+namespace OpenSim.Framework
 {
     public class GridConfig
     {

OpenSim/Framework/General/IAssetProvider.cs

@@ -29,10 +29,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using libsecondlife;
 
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework
 {
     public interface IAssetProvider :  IPlugin
     {

OpenSim/Framework/General/IAssetServer.cs

@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework
 {
     /// <summary>
     /// Description of IAssetServer.

OpenSim/Framework/General/IClientAPI.cs

@@ -30,9 +30,9 @@ using System.Collections.Generic;
 using System.Net;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework
 {
     // Base Args Interface
     public interface IEventArgs

OpenSim/Framework/General/IGenericConfig.cs

@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-namespace OpenSim.Framework.Configuration.Interfaces
+namespace OpenSim.Framework
 {
     public interface IGenericConfig
     {

OpenSim/Framework/General/IPlugin.cs

@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework
 {
     /// <summary>
     /// This interface, describes a generic plugin

OpenSim/Framework/General/IRegionCommsListener.cs

@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework
 {

OpenSim/Framework/General/IScene.cs

@@ -26,9 +26,9 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework
 {
     public interface IScene
     {

OpenSim/Framework/General/IUserData.cs

@@ -26,9 +26,9 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Framework
 {
     /// <summary>
     /// An interface for connecting to user storage servers.

OpenSim/Framework/General/IUserService.cs

@@ -26,7 +26,7 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Framework.Interfaces
 {

OpenSim/Framework/General/InventoryItemBase.cs

@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     /// <summary>
     /// Inventory Item - contains all the properties associated with an individual inventory piece.

OpenSim/Framework/General/LandData.cs

@@ -27,7 +27,7 @@
 */
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     
         public class LandData

OpenSim/Framework/General/Login.cs

@@ -27,7 +27,7 @@
 */
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class Login
     {

OpenSim/Framework/General/MapBlockData.cs

@@ -29,7 +29,7 @@
 using System;
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class MapBlockData
     {

OpenSim/Framework/General/NeighbourInfo.cs

@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class NeighbourInfo
     {

OpenSim/Framework/General/NetworkServersInfo.cs

@@ -28,10 +28,10 @@
 using System;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
 
 using Nini.Config;
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class NetworkServersInfo
     {

OpenSim/Framework/General/PrimitiveBaseShape.cs

@@ -30,7 +30,7 @@ using System.Xml.Serialization;
 using libsecondlife;
 using libsecondlife.Packets;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public enum ProfileShape : byte
     {

OpenSim/Framework/General/RegionCommsListener.cs

@@ -27,7 +27,7 @@
 */
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 using System.Collections.Generic;
 

OpenSim/Framework/General/RegionHandle.cs

@@ -29,7 +29,7 @@
 using System;
 using System.Net;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     /// <summary>
     /// A class for manipulating RegionHandle coordinates

OpenSim/Framework/General/RegionInfo.cs

@@ -33,12 +33,9 @@ using Nini.Config;
 using libsecondlife;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
-using OpenSim.Framework.Configuration;
-
-
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     public class SimpleRegionInfo
     {

OpenSim/Framework/General/UUID.cs

@@ -29,7 +29,7 @@
 using System;
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     class UUID
     {

OpenSim/Framework/General/UserConfig.cs

@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace OpenSim.Framework.Configuration
+namespace OpenSim.Framework
 {
     /// <summary>
     /// UserConfig -- For User Server Configuration

OpenSim/Framework/General/UserProfileData.cs

@@ -28,7 +28,7 @@
 using System;
 using libsecondlife;
 
-namespace OpenSim.Framework.Types
+namespace OpenSim.Framework
 {
     /// <summary>
     /// Information about a particular user known to the userserver

OpenSim/Framework/General/Util.cs

@@ -35,7 +35,7 @@ using libsecondlife;
 
 using Nini.Config;
 
-namespace OpenSim.Framework.Utilities
+namespace OpenSim.Framework
 {
     public class Util
     {

OpenSim/Grid/AssetServer/Main.cs

@@ -33,13 +33,13 @@ using System.Reflection;
 using libsecondlife;
 using Nini.Config;
 
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.AssetServer

OpenSim/Grid/AssetServer/RestService.cs

@@ -5,7 +5,7 @@ using System.Xml.Serialization;
 using System.Text;
 
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Console;

OpenSim/Grid/GridServer/GridManager.cs

@@ -36,9 +36,9 @@ using Nwc.XmlRpc;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
 
 namespace OpenSim.Grid.GridServer
 {

OpenSim/Grid/GridServer/Main.cs

@@ -34,8 +34,8 @@ using System.Timers;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Configuration;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
 
 using Timer=System.Timers.Timer;
 

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

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

OpenSim/Grid/ScriptServer/ScriptServerMain.cs

@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 
 namespace OpenSim.Grid.ScriptServer
 {

OpenSim/Grid/UserServer/Main.cs

@@ -34,8 +34,8 @@ using libsecondlife;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
+using OpenSim.Framework;
 
 namespace OpenSim.Grid.UserServer
 {

OpenSim/Grid/UserServer/UserLoginService.cs

@@ -32,9 +32,9 @@ using System.Net;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Configuration;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
+using OpenSim.Framework;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Grid.UserServer

OpenSim/Grid/UserServer/UserManager.cs

@@ -29,9 +29,9 @@ using System;
 using System.Collections;
 using System.Net;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using libsecondlife;
 
 namespace OpenSim.Grid.UserServer

OpenSim/Region/Application/Application.cs

@@ -46,7 +46,7 @@ namespace OpenSim
 
             Console.Write("Performing compatibility checks... ");
             string supported = "";
-            if (OpenSim.Framework.Utilities.Util.IsEnvironmentSupported(ref supported))
+            if (OpenSim.Framework.Util.IsEnvironmentSupported(ref supported))
             {
                 Console.WriteLine(" Environment is compatible.\n");
             }

OpenSim/Region/Application/OpenSimController.cs

@@ -8,8 +8,8 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
@@ -18,7 +18,7 @@ using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
 using System.Globalization;
 using Nwc.XmlRpc;
-using RegionInfo = OpenSim.Framework.Types.RegionInfo;
+using RegionInfo = OpenSim.Framework.RegionInfo;
 
 namespace OpenSim
 {

OpenSim/Region/Application/OpenSimMain.cs

@@ -35,17 +35,17 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
 using System.Globalization;
-using RegionInfo = OpenSim.Framework.Types.RegionInfo;
+using RegionInfo = OpenSim.Framework.RegionInfo;
 
 namespace OpenSim
 {

OpenSim/Region/ClientStack/ClientView.API.cs

@@ -34,8 +34,8 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.ClientStack
 {
@@ -769,13 +769,17 @@ namespace OpenSim.Region.ClientStack
             viewertime.TimeInfo.SecPerYear = 365000;
             viewertime.TimeInfo.SunPhase = 1;
             int sunPhase = (phase + 2) / 2;
-            if ((sunPhase < 12) || (sunPhase > 36))
+            if ((sunPhase < 6) || (sunPhase > 36))
             {
                 viewertime.TimeInfo.SunDirection = new LLVector3(0f, 0.8f, -0.8f);
                 //Console.WriteLine("sending night");
             }
             else
             {
+                if (sunPhase < 12)
+                {
+                    sunPhase = 12;
+                }
                 sunPhase = sunPhase - 12;
                 float yValue = 0.1f * (sunPhase);
                 if (yValue > 1.2f) { yValue = yValue - 1.2f; }

OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs

@@ -29,6 +29,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.ClientStack
 {

OpenSim/Region/ClientStack/ClientView.PacketQueue.cs

@@ -33,7 +33,7 @@ using System.Timers;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Region.Environment;
 
 namespace OpenSim.Region.ClientStack

OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs

@@ -30,9 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 

OpenSim/Region/ClientStack/ClientView.cs

@@ -36,10 +36,6 @@ using libsecondlife.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
 using Timer = System.Timers.Timer;
 
 namespace OpenSim.Region.ClientStack

OpenSim/Region/ClientStack/PacketServer.cs

@@ -31,7 +31,7 @@ using System.Net.Sockets;
 using libsecondlife.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Interfaces;
 using libsecondlife;
 

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -33,7 +33,7 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
 using OpenSim.Region.Environment;
 using libsecondlife;

OpenSim/Region/ClientStack/UDPServer.cs

@@ -32,7 +32,7 @@ using System.Net.Sockets;
 using libsecondlife.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 

OpenSim/Region/Communications/Local/CommunicationsLocal.cs

@@ -29,7 +29,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Communications.Local
 {

OpenSim/Region/Communications/Local/LocalBackEndServices.cs

@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using System.Collections;
 
 namespace OpenSim.Region.Communications.Local

OpenSim/Region/Communications/Local/LocalInventoryService.cs

@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Communications.Local
 {

OpenSim/Region/Communications/Local/LocalLoginService.cs

@@ -31,10 +31,8 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Inventory;
 
 namespace OpenSim.Region.Communications.Local
 {
@@ -184,7 +182,7 @@ namespace OpenSim.Region.Communications.Local
 
                 ArrayList AgentInventoryArray = new ArrayList();
                 Hashtable TempHash;
-                foreach (OpenSim.Framework.Inventory.InventoryFolder InvFolder in userInventory.InventoryFolders.Values)
+                foreach (OpenSim.Framework.InventoryFolder InvFolder in userInventory.InventoryFolders.Values)
                 {
                     TempHash = new Hashtable();
                     TempHash["name"] = InvFolder.FolderName;

OpenSim/Region/Communications/Local/LocalUserServices.cs

@@ -28,7 +28,7 @@
 
 using System;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.UserManagement;
 
 namespace OpenSim.Region.Communications.Local

OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs

@@ -28,7 +28,7 @@
 
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 
 

OpenSim/Region/Communications/OGS1/OGS1GridServices.cs

@@ -42,7 +42,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Region.Communications.Local;
 
 namespace OpenSim.Region.Communications.OGS1
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Communications.OGS1
                         int port = Convert.ToInt32(neighbourData["sim_port"]);
                         string externalUri = (string)neighbourData["sim_uri"];
 
-                        string externalIpStr = OpenSim.Framework.Utilities.Util.GetHostFromDNS(simIp).ToString();
+                        string externalIpStr = OpenSim.Framework.Util.GetHostFromDNS(simIp).ToString();
                         SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
                         sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);
                         sri.RegionID = new LLUUID((string)neighbourData["uuid"]);

OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs

@@ -28,7 +28,7 @@
 
 using System;
 using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim.Region.Communications.OGS1
 {

OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs

@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 
 namespace OpenSim.Region.Communications.OGS1