== The "right name and place" commit ==

* Moved InventoryData to Framework.Types/InventoryItemBase.cs
* Moved UserData to Framework.Interfaces/IUserData.cs
* Moved UserProfileData to Framework/Types/UserProfileData.cs
* Deleted ass-backwards Framework dependency on Framework.Data (now it's the other way round)
* Changed some namespaces to reflect file structure

22 files changed, 23 insertions, 30 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index d0507d0..51fc462 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -32,10 +32,10 @@ using System.Text;
 using System.IO;
 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.Data;
 using OpenSim.Region.Capabilities;
 using OpenSim.Framework.Servers;
 
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 99dc45a..b1432ff 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -25,22 +25,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using libsecondlife;
-using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-using OpenSim.Framework.Data;
-using OpenSim.Framework.Utilities;
+using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
 
-namespace OpenSim.Framework.Communications.Caches
+namespace OpenSim.Framework.Communications.Cache
 {
     public class CachedUserInfo
     {
-        private CommunicationsManager m_parentCommsManager;
+        private readonly CommunicationsManager m_parentCommsManager;
         // Fields
         public InventoryFolder RootFolder = null;
         public UserProfileData UserProfile = null;
@@ -127,7 +120,4 @@ namespace OpenSim.Framework.Communications.Caches
             return result;
         }
     }
-
-
-}
-
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
index 885cffc..fbe1bd0 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
@@ -32,7 +32,6 @@ using System.Text;
 using System.IO;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index deef028..38fad68 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -3,8 +3,8 @@ using System.IO;
 using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Data;
 using Nini.Config;
 
 namespace OpenSim.Framework.Communications.Caches
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 390b938..9e32ea5 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -31,10 +31,10 @@ using System.Collections.Generic;
 using System.Text;
 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.Data;
 
 namespace OpenSim.Framework.Communications.Caches
 {
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 59c6d7c..4ed59c7 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Data;
 
 namespace OpenSim.Region.Capabilities
 {
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index e266b90..5af07f7 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -29,7 +29,6 @@ using System;
 using libsecondlife;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Caches;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 80c2e64..980bb27 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenSim.Framework.Data;
 using libsecondlife;
 using OpenSim.Framework.Communications.Caches;
+using OpenSim.Framework.Types;
 using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index da7a0ce..7536429 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -4,7 +4,7 @@ using System.Reflection;
 using libsecondlife;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
 using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 8e7cf80..06abb69 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -6,9 +6,9 @@ using System.Security.Cryptography;
 using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;

 using OpenSim.Framework.Utilities;
 
 using OpenSim.Framework.Configuration;
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index bbda054..56ed959 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -37,6 +37,7 @@ using OpenSim.Framework.Configuration;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Framework.UserManagement
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 0ab7aec..224b842 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using Db4objects.Db4o;
 using libsecondlife;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Data.DB4o
 {
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 2ab1488..38f1b55 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -28,6 +28,7 @@
 using System;
 using System.IO;
 using libsecondlife;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Framework.Data.DB4o
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 5009d9e..f773da4 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using libsecondlife;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Data.MySQL
 {
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 5037f98..a83ee45 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using libsecondlife;
 using MySql.Data.MySqlClient;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Data.MySQL
 {
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index e746717..301550f 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using libsecondlife;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Data.MySQL
 {
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index 3a13ecc..c7b7659 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -28,6 +28,7 @@
 using System;
 using System.IO;
 using libsecondlife;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
 using System.Data;
 using System.Data.SqlTypes;
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 344a55c..bedea9e 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -31,7 +31,6 @@ using System.Net;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Types;
-using OpenSim.Framework.Data;
 
 namespace OpenSim.Framework.Interfaces
 {
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/General/Interfaces/IUserData.cs
index 13bdf17..bb3abe0 100644
--- a/OpenSim/Framework/Data/UserData.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserData.cs
@@ -26,6 +26,7 @@
 * 
 */
 using libsecondlife;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Data
 {
diff --git a/OpenSim/Framework/General/Interfaces/IUserService.cs b/OpenSim/Framework/General/Interfaces/IUserService.cs
index 974e025..461d4cb 100644
--- a/OpenSim/Framework/General/Interfaces/IUserService.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserService.cs
@@ -26,7 +26,7 @@
 * 
 */
 using libsecondlife;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Framework.Interfaces
 {
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/General/Types/InventoryItemBase.cs
index 2df26e1..e3dbe71 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/General/Types/InventoryItemBase.cs
@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Framework.Types
 {
     /// <summary>
     /// Inventory Item - contains all the properties associated with an individual inventory piece.
@@ -219,4 +219,4 @@ namespace OpenSim.Framework.Data
         /// <param name="folder">The inventory folder</param>
         void updateInventoryFolder(InventoryFolderBase folder);
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/General/Types/UserProfileData.cs
index 4fafe3f..20d8224 100644
--- a/OpenSim/Framework/Data/UserProfileData.cs
+++ b/OpenSim/Framework/General/Types/UserProfileData.cs
@@ -28,7 +28,7 @@
 using System;
 using libsecondlife;
 
-namespace OpenSim.Framework.Data
+namespace OpenSim.Framework.Types
 {
     /// <summary>
     /// Information about a particular user known to the userserver
@@ -68,7 +68,6 @@ namespace OpenSim.Framework.Data
             set { 
                 homeRegionX = (uint)(value >> 40);
                 homeRegionY = (((uint)(value)) >> 8);
-                Console.WriteLine("HomeRegion => Incoming: " + value + ", Computed: " + homeRegion);
             }
         }
         public uint homeRegionX;
@@ -189,4 +188,4 @@ namespace OpenSim.Framework.Data
         /// </summary>
         public LLVector3 currentPos;
     }
-}
+}
\ No newline at end of file