10 files changed, 14 insertions, 14 deletions

diff --git a/opensim.build b/opensim.build
index cb692dc..ed43a11 100644
--- a/opensim.build
+++ b/opensim.build
@@ -53,14 +53,14 @@
         <nant>
                 <buildfiles>
                         <include name="src/GridInterfaces/default.build" />
-                        <include name="src/OpenGrid.Framework/default.build" />
+                        <include name="src/OpenSim.Framework/default.build" />
                         <include name="src/ServerConsole/default.build" />
                         <include name="src/LocalServers/default.build" />
                         <include name="src/RemoteServers/default.build" />
                         <include name="src/physics/default.build" />
                         <include name="src/physics/plugins/default.build" />
                         <include name="src/LocalStorage/default.build" />
-                        <include name="src/OpenGrid.Framework/default.build" />
+                        <include name="src/OpenSim.Framework/default.build" />
                 </buildfiles>
         </nant>
 
@@ -76,7 +76,7 @@
                                 <include name="ServerConsole.dll" />
                                 <include name="GridInterfaces.dll" />
                                 <include name="PhysicsManager.dll" />
-                                <include name="OpenGrid.Framework.dll" />
+                                <include name="OpenSim.Framework.dll" />
                         </references>
                         <sources basedir="src/">
                                 <include name="*.cs" />
diff --git a/src/GridInterfaces/default.build b/src/GridInterfaces/default.build
index a1de6e5..dd02448 100644
--- a/src/GridInterfaces/default.build
+++ b/src/GridInterfaces/default.build
@@ -39,7 +39,7 @@
                         <references basedir="../../bin" failonempty="true">
                                 <include name="System.dll" />
                                 <include name="System.Xml.dll" />
-                                <include name="OpenGrid.Framework.dll" />
+                                <include name="OpenSim.Framework.dll" />
                                 <include name="libsecondlife.dll" />
                         </references>
                         <sources basedir="./">
diff --git a/src/GridServers/LoginServer.cs b/src/GridServers/LoginServer.cs
index f96b9f9..9d33523 100644
--- a/src/GridServers/LoginServer.cs
+++ b/src/GridServers/LoginServer.cs
@@ -38,7 +38,7 @@ using System.Security.Cryptography;
 using System.Xml;

 using libsecondlife;

 using OpenSim;

-using OpenGrid.Framework;

+using OpenSim.Framework;

 

 namespace OpenSim.GridServers

 {

diff --git a/src/OpenGrid.Framework/AssemblyInfo.cs b/src/OpenSim.Framework/AssemblyInfo.cs
index 0ff408f..0ff408f 100644
--- a/src/OpenGrid.Framework/AssemblyInfo.cs
+++ b/src/OpenSim.Framework/AssemblyInfo.cs
diff --git a/src/OpenGrid.Framework/LoginService.cs b/src/OpenSim.Framework/LoginService.cs
index d38c271..85fe761 100644
--- a/src/OpenGrid.Framework/LoginService.cs
+++ b/src/OpenSim.Framework/LoginService.cs
@@ -6,7 +6,7 @@ using Nwc.XmlRpc;
 using OpenSim.GridServers;

 using libsecondlife;

 

-namespace OpenGrid.Framework

+namespace OpenSim.Framework

 {

     public abstract class LoginService

     {

diff --git a/src/OpenGrid.Framework/OpenGrid.Framework.csproj b/src/OpenSim.Framework/OpenSim.Framework.csproj
index efbbcfb..c8bba5d 100644
--- a/src/OpenGrid.Framework/OpenGrid.Framework.csproj
+++ b/src/OpenSim.Framework/OpenSim.Framework.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</ProjectGuid>

     <OutputType>Library</OutputType>

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>OpenGrid.Framework</RootNamespace>

+    <RootNamespace>OpenSim.Framework</RootNamespace>

     <AssemblyName>OpenGrid.Framework</AssemblyName>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/OpenGrid.Framework/Properties/AssemblyInfo.cs b/src/OpenSim.Framework/Properties/AssemblyInfo.cs
index 72e55b9..72e55b9 100644
--- a/src/OpenGrid.Framework/Properties/AssemblyInfo.cs
+++ b/src/OpenSim.Framework/Properties/AssemblyInfo.cs
diff --git a/src/OpenGrid.Framework/default.build b/src/OpenSim.Framework/default.build
index ee398a0..57dfee8 100644
--- a/src/OpenGrid.Framework/default.build
+++ b/src/OpenSim.Framework/default.build
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-    <project name="OpenGrid.Framework" default="build" basedir=".">
-        <description>nant buildfile for OpenGrid.Framework</description>
+    <project name="OpenSim.Framework" default="build" basedir=".">
+        <description>nant buildfile for OpenSim.Framework</description>
         <property name="debug" value="true" overwrite="false" />
         <target name="clean" description="remove all generated files">
-            <delete file="../../bin/OpenGrid.Framework.dll" failonerror="false" />
+            <delete file="../../bin/OpenSim.Framework.dll" failonerror="false" />
         </target>
 
         <target name="svnupdate" description="updates to latest SVN">
@@ -35,7 +35,7 @@
                 </attributes>
         </asminfo>
 
-        <csc target="library" output="../../bin/OpenGrid.Framework.dll" debug="${debug}" verbose="true" warninglevel="4">
+        <csc target="library" output="../../bin/OpenSim.Framework.dll" debug="${debug}" verbose="true" warninglevel="4">
                         <references basedir="../../bin" failonempty="true">
                                 <include name="System.dll" />
                                 <include name="System.Xml.dll" />
diff --git a/src/Second-server.csproj b/src/Second-server.csproj
index be4a913..2dda6db 100644
--- a/src/Second-server.csproj
+++ b/src/Second-server.csproj
@@ -90,9 +90,9 @@
       <Project>{74784F23-B0FD-484C-82C1-96C0215733DC}</Project>

       <Name>Db4LocalStorage</Name>

     </ProjectReference>

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

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

       <Project>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</Project>

-      <Name>OpenGrid.Framework</Name>

+      <Name>OpenSim.Framework</Name>

     </ProjectReference>

     <ProjectReference Include="physics\PhysicsManager.csproj">

       <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>

diff --git a/src/opensim.sln b/src/opensim.sln
index e9951b8..c4be551 100644
--- a/src/opensim.sln
+++ b/src/opensim.sln
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicPhysicsplugin", "physi
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealPhysXplugin", "physics\RealPhysX\RealPhysXplugin\RealPhysXplugin.csproj", "{56C1D214-F389-4228-921A-0A3A0712C159}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework", "OpenGrid.Framework\OpenGrid.Framework.csproj", "{407CE85B-628C-4788-9DBC-49BCEFC3A84F}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{407CE85B-628C-4788-9DBC-49BCEFC3A84F}"

 EndProject

 Global

         GlobalSection(SolutionConfigurationPlatforms) = preSolution