From 30ea28c3b1f7e8bc6534f5353236eb59328ce999 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 2 Apr 2008 16:00:40 +0000
Subject: fix ups to include OpenSim.Framework explicit includes (they were
 implicitly included before).  Everything builds again. Now off to testing.

---
 OpenSim/Data/AssetDataBase.cs               | 1 +
 OpenSim/Data/DB4o/DB4oGridData.cs           | 1 +
 OpenSim/Data/DB4o/DB4oManager.cs            | 1 +
 OpenSim/Data/DB4o/DB4oUserData.cs           | 1 +
 OpenSim/Data/MSSQL/MSSQLAssetData.cs        | 1 +
 OpenSim/Data/MSSQL/MSSQLInventoryData.cs    | 1 +
 OpenSim/Data/MSSQL/MSSQLManager.cs          | 1 +
 OpenSim/Data/MSSQL/MSSQLUserData.cs         | 1 +
 OpenSim/Data/MySQL/MySQLAssetData.cs        | 1 +
 OpenSim/Data/MySQL/MySQLDataStore.cs        | 1 +
 OpenSim/Data/MySQL/MySQLInventoryData.cs    | 1 +
 OpenSim/Data/MySQL/MySQLManager.cs          | 1 +
 OpenSim/Data/MySQL/MySQLUserData.cs         | 1 +
 OpenSim/Data/RegionProfileData.cs           | 1 +
 OpenSim/Data/SQLite/SQLiteAssetData.cs      | 1 +
 OpenSim/Data/SQLite/SQLiteGridData.cs       | 1 +
 OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 1 +
 OpenSim/Data/SQLite/SQLiteUserData.cs       | 1 +
 OpenSim/Data/UserDataBase.cs                | 1 +
 prebuild.xml                                | 6 +++---
 20 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index 2b2f90d..92dbc63 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
+using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
diff --git a/OpenSim/Data/DB4o/DB4oGridData.cs b/OpenSim/Data/DB4o/DB4oGridData.cs
index d10e7ed..797fdd4 100644
--- a/OpenSim/Data/DB4o/DB4oGridData.cs
+++ b/OpenSim/Data/DB4o/DB4oGridData.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using libsecondlife;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.DB4o
 {
diff --git a/OpenSim/Data/DB4o/DB4oManager.cs b/OpenSim/Data/DB4o/DB4oManager.cs
index c767246..d9085c5 100644
--- a/OpenSim/Data/DB4o/DB4oManager.cs
+++ b/OpenSim/Data/DB4o/DB4oManager.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using Db4objects.Db4o;
 using libsecondlife;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.DB4o
 {
diff --git a/OpenSim/Data/DB4o/DB4oUserData.cs b/OpenSim/Data/DB4o/DB4oUserData.cs
index b2b1f4d..62671e3 100644
--- a/OpenSim/Data/DB4o/DB4oUserData.cs
+++ b/OpenSim/Data/DB4o/DB4oUserData.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using libsecondlife;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.DB4o
 {
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 6bae356..e68b5c4 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 28d787e..df7020d 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 16f0f9f..5154092 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -32,6 +32,7 @@ using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 3f58939..c045084 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index d5f7816..50f1cc5 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using libsecondlife;
 using MySql.Data.MySqlClient;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 0d9fb3b..de15421 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -32,6 +32,7 @@ using System.Diagnostics;
 using System.IO;
 using libsecondlife;
 using MySql.Data.MySqlClient;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 326bf60..ceb73c5 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using libsecondlife;
 using MySql.Data.MySqlClient;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 3d408d0..0d36136 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -33,6 +33,7 @@ using System.IO;
 using System.Reflection;
 using libsecondlife;
 using MySql.Data.MySqlClient;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index b03d1d9..bd094f6 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text.RegularExpressions;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 540c1d4..000a500 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using libsecondlife;
 using Nwc.XmlRpc;
+using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index c7b0984..25a127b 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -30,6 +30,7 @@ using System.Data;
 using System.Reflection;
 using libsecondlife;
 using Mono.Data.SqliteClient;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 7575245..c52eb29 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -31,6 +31,7 @@ using System.Data;
 using System.Security.Cryptography;
 using System.Text;
 using libsecondlife;
+using OpenSim.Framework;
 
 namespace OpenSim.Data.SQLite
 {
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index bdbb56e..aa56121 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -31,6 +31,7 @@ using System.Data;
 using System.Reflection;
 using libsecondlife;
 using Mono.Data.SqliteClient;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 3c72574..ad3d1a4 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using libsecondlife;
 using Mono.Data.SqliteClient;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 0dc721d..dcead15 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using libsecondlife;
+using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
diff --git a/prebuild.xml b/prebuild.xml
index 305c775..479a271 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -159,19 +159,18 @@
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
-          <KeyFile>OpenSim.Data.Base.snk</KeyFile>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
-          <KeyFile>OpenSim.Data.Base.snk</KeyFile>
         </Options>
       </Configuration>
 
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Data"/>
+      <Reference name="OpenSim.Framework"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
@@ -200,7 +199,8 @@
       <Reference name="OpenSim.Data.Base"/>
       <Reference name="log4net"/>
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="false"/>
+        <Match pattern="Properties/*.cs" recurse="false"/>
       </Files>
     </Project>
 
-- 
cgit v1.1