== 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

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;
 

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 InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
-using OpenSim.Framework.Utilities;
 
-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;
         }
     }
-
-
 }
-

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;
 

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

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
 {

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
 {

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;

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

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

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;

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

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
 {

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

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
 {

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
 {

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
 {

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;

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
 {

OpenSim/Framework/General/Interfaces/IUserData.cs

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

OpenSim/Framework/General/Interfaces/IUserService.cs

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

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.

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;

OpenSim/Grid/UserServer/UserLoginService.cs

@@ -6,6 +6,7 @@ using OpenSim.Framework.Data;
 using OpenSim.Framework.UserManagement;
 using OpenSim.Framework.Utilities;
 using OpenSim.Framework.Configuration;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Grid.UserServer
 {

OpenSim/Grid/UserServer/UserManager.cs

@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Net;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.UserManagement;
 using OpenSim.Framework.Utilities;
 using libsecondlife;

OpenSim/Region/ClientStack/ClientView.API.cs

@@ -35,7 +35,6 @@ using libsecondlife.Packets;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Region.ClientStack

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -31,7 +31,6 @@ using System.Net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Types;

OpenSim/Region/Communications/Local/LocalInventoryService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
 using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 namespace OpenSim.Region.Communications.Local

OpenSim/Region/Communications/Local/LocalLoginService.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.UserManagement;
 using OpenSim.Framework.Utilities;

OpenSim/Region/Communications/Local/LocalUserServices.cs

@@ -1,6 +1,5 @@
 using System;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.UserManagement;
 

OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
 using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
 
 

OpenSim/Region/Communications/OGS1/OGS1UserServices.cs

@@ -2,8 +2,8 @@ using System;
 using System.Collections;
 using libsecondlife;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
 
 namespace OpenSim.Region.Communications.OGS1
 {

OpenSim/Region/Environment/Scenes/Scene.Inventory.cs

@@ -1,8 +1,8 @@
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Caches;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;

OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs

@@ -6,7 +6,6 @@ using System.Xml;
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Region.Environment.Interfaces;

OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs

@@ -3,7 +3,6 @@ using System.Net;
 using System.Text;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Data;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;

prebuild.xml

@@ -53,30 +53,6 @@
       </Files>
     </Project>
 	
-
-    <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Data"/>
-      <Reference name="XMLRPC.dll"/>
-      <Reference name="libsecondlife.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project name="OpenSim.Framework" path="OpenSim/Framework/General" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -97,13 +73,35 @@
       <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Data"/>
       <Reference name="Nini.dll" />
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
 
+    <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
 
     <Project name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library">
       <Configuration name="Debug">
@@ -408,11 +406,11 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Data" />
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Framework"/>
       <Reference name="XMLRPC.dll"/>
 
       <Files>
@@ -438,11 +436,12 @@
       <Reference name="System.Data"/>
       <Reference name="System.Runtime.Remoting"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Data" />     
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Communications" />
       <Reference name="OpenSim.Region.Communications.Local" />
-      <Reference name="OpenSim.Framework.Data" />
+
       <Reference name="libsecondlife.dll"/>
       <Reference name="XMLRPC.dll"/>
 
@@ -471,8 +470,8 @@
       <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
       <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Data" />
+      <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <!-- For scripting in funny languages by default -->
@@ -506,12 +505,12 @@
       <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
       <Reference name="OpenSim.Region.Environment"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Data"/>
+      <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Region.Communications.Local"/>      
       <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Data"/>
       <Reference name="XMLRPC.dll"/>
 
       <Files>
@@ -693,6 +692,7 @@
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
+      <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Data"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="MySql.Data.dll"/>