8 files changed, 36 insertions, 36 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 4d6cf63..43e3054 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -28,9 +28,9 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 

-namespace OpenGrid.Framework.Data.MySQL

+namespace OpenSim.Framework.Data.MySQL

 {

     /// <summary>

     /// A MySQL Interface for the Grid Server

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index fb429e4..434df1a 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data.MySQL

+namespace OpenSim.Framework.Data.MySQL

 {

     /// <summary>

     /// A MySQL interface for the inventory server

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index c88b39f..8265614 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenGrid.Framework.Data.MySQL

+namespace OpenSim.Framework.Data.MySQL

 {

     /// <summary>

     /// An interface to the log database for MySQL

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 53b3bdd..b2f398b 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -36,9 +36,9 @@ using MySql.Data;
 using MySql.Data.Types;

 using MySql.Data.MySqlClient;

 

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 

-namespace OpenGrid.Framework.Data.MySQL

+namespace OpenSim.Framework.Data.MySQL

 {

     /// <summary>

     /// A MySQL Database manager

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 032a0e6..0304452 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -28,10 +28,10 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using libsecondlife;

 

-namespace OpenGrid.Framework.Data.MySQL

+namespace OpenSim.Framework.Data.MySQL

 {

     /// <summary>

     /// A database interface class to a user profile storage system

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.mine b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 75ef149..62e3887 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.mine
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{0F3C3AC1-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{17F7F6BE-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenGrid.Framework.Data.MySQL</AssemblyName>

+    <AssemblyName>OpenSim.Framework.Data.MySQL</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework.Data.MySQL</RootNamespace>

+    <RootNamespace>OpenSim.Framework.Data.MySQL</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -58,31 +58,31 @@
     <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

-      <HintPath>System.dll</HintPath>

+    <Reference Include="libsecondlife.dll" >

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

-      <HintPath>System.Xml.dll</HintPath>

+    <Reference Include="MySql.Data.dll" >

+      <HintPath>..\..\..\bin\MySql.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

-      <HintPath>System.Data.dll</HintPath>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+    <Reference Include="System.Data" >

+      <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="MySql.Data.dll" >

-      <HintPath>..\..\bin\MySql.Data.dll</HintPath>

+    <Reference Include="System.Xml" >

+      <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

-      <Name>OpenGrid.Framework.Data</Name>

-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">

+      <Name>OpenSim.Framework.Data</Name>

+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index a5f4028..594ec52 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenGrid.Framework.Data.MySQL" default="build">

+<project name="OpenSim.Framework.Data.MySQL" default="build">

     <target name="build">

         <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

         <mkdir dir="${project::get-base-directory()}/${build.dir}" />

@@ -8,7 +8,7 @@
             </fileset>

         </copy>

         <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

-            <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" >

+            <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

                 <include name="MySQLGridData.cs" />

@@ -23,17 +23,17 @@
                     <include name="${project::get-base-directory()}" />

                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/MySql.Data.dll" />

-                <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="../../../bin/libsecondlife.dll" />

+                <include name="../../../bin/MySql.Data.dll" />

+                <include name="../../../bin/OpenSim.Framework.Data.dll" />

                 <include name="System.dll" />

                 <include name="System.Data.dll" />

                 <include name="System.Xml.dll" />

             </references>

         </csc>

-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>

-        <copy todir="${project::get-base-directory()}/../../bin/">

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>

+        <copy todir="${project::get-base-directory()}/../../../bin/">

             <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

                 <include name="*.dll"/>

                 <include name="*.exe"/>

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
index 0bfd1d6..d67ccf6 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

-[assembly: AssemblyTitle("OpenGrid.Framework.Data.MySQL")]

+[assembly: AssemblyTitle("OpenSim.Framework.Data.MySQL")]

 [assembly: AssemblyDescription("")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenGrid.Framework.Data.MySQL")]

+[assembly: AssemblyProduct("OpenSim.Framework.Data.MySQL")]

 [assembly: AssemblyCopyright("Copyright ©  2007")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]