1 files changed, 19 insertions, 19 deletions
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
index 291f997..424072e 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -3,20 +3,20 @@
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{21BFC8E2-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{60FCC3A6-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ApplicationIcon></ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGridServices.GridServer</AssemblyName>
+    <AssemblyName>OpenSim.Grid.GridServer</AssemblyName>
    <DefaultClientScript>JScript</DefaultClientScript>
    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Exe</OutputType>
    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGridServices.GridServer</RootNamespace>
+    <RootNamespace>OpenSim.Grid.GridServer</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>
@@ -59,11 +59,11 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Db4objects.Db4o.dll" >
-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="OpenSim.Framework" >
@@ -74,12 +74,12 @@
      <HintPath>OpenSim.Framework.Console.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.GenericConfig.Xml" >
+    <Reference Include="OpenSim.Framework.GenericConfig.Xml" >
-      <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
+      <HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="OpenSim.Servers" >
+    <Reference Include="OpenSim.Framework.Servers" >
-      <HintPath>OpenSim.Servers.dll</HintPath>
+      <HintPath>OpenSim.Framework.Servers.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" >
@@ -94,21 +94,21 @@
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="XMLRPC" >
+    <Reference Include="XMLRPC.dll" >
-      <HintPath>XMLRPC.dll</HintPath>
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+    <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
+      <Name>OpenSim.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj">
+    <ProjectReference Include="..\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj">
-      <Name>OpenGrid.Framework.Manager</Name>
+      <Name>OpenSim.Grid.Framework.Manager</Name>
-      <Project>{7924FD35-0000-0000-0000-000000000000}</Project>
+      <Project>{4B7BFD1C-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
                        <Private>False</Private>
    </ProjectReference>

diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj index 291f997..424072e 100644 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -3,20 +3,20 @@
3	<ProjectType>Local</ProjectType>	3	<ProjectType>Local</ProjectType>
4	<ProductVersion>8.0.50727</ProductVersion>	4	<ProductVersion>8.0.50727</ProductVersion>
5	<SchemaVersion>2.0</SchemaVersion>	5	<SchemaVersion>2.0</SchemaVersion>
6	<ProjectGuid>{21BFC8E2-0000-0000-0000-000000000000}</ProjectGuid>	6	<ProjectGuid>{60FCC3A6-0000-0000-0000-000000000000}</ProjectGuid>
7	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>	7	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>	8	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9	<ApplicationIcon></ApplicationIcon>	9	<ApplicationIcon></ApplicationIcon>
10	<AssemblyKeyContainerName>	10	<AssemblyKeyContainerName>
11	</AssemblyKeyContainerName>	11	</AssemblyKeyContainerName>
12	<AssemblyName>OpenGridServices.GridServer</AssemblyName>	12	<AssemblyName>OpenSim.Grid.GridServer</AssemblyName>
13	<DefaultClientScript>JScript</DefaultClientScript>	13	<DefaultClientScript>JScript</DefaultClientScript>
14	<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>	14	<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15	<DefaultTargetSchema>IE50</DefaultTargetSchema>	15	<DefaultTargetSchema>IE50</DefaultTargetSchema>
16	<DelaySign>false</DelaySign>	16	<DelaySign>false</DelaySign>
17	<OutputType>Exe</OutputType>	17	<OutputType>Exe</OutputType>
18	<AppDesignerFolder></AppDesignerFolder>	18	<AppDesignerFolder></AppDesignerFolder>
19	<RootNamespace>OpenGridServices.GridServer</RootNamespace>	19	<RootNamespace>OpenSim.Grid.GridServer</RootNamespace>
20	<StartupObject></StartupObject>	20	<StartupObject></StartupObject>
21	<FileUpgradeFlags>	21	<FileUpgradeFlags>
22	</FileUpgradeFlags>	22	</FileUpgradeFlags>
@@ -32,7 +32,7 @@
32	<DebugSymbols>True</DebugSymbols>	32	<DebugSymbols>True</DebugSymbols>
33	<FileAlignment>4096</FileAlignment>	33	<FileAlignment>4096</FileAlignment>
34	<Optimize>False</Optimize>	34	<Optimize>False</Optimize>
35	<OutputPath>..\..\bin\</OutputPath>	35	<OutputPath>..\..\..\bin\</OutputPath>
36	<RegisterForComInterop>False</RegisterForComInterop>	36	<RegisterForComInterop>False</RegisterForComInterop>
37	<RemoveIntegerChecks>False</RemoveIntegerChecks>	37	<RemoveIntegerChecks>False</RemoveIntegerChecks>
38	<TreatWarningsAsErrors>False</TreatWarningsAsErrors>	38	<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
50	<DebugSymbols>False</DebugSymbols>	50	<DebugSymbols>False</DebugSymbols>
51	<FileAlignment>4096</FileAlignment>	51	<FileAlignment>4096</FileAlignment>
52	<Optimize>True</Optimize>	52	<Optimize>True</Optimize>
53	<OutputPath>..\..\bin\</OutputPath>	53	<OutputPath>..\..\..\bin\</OutputPath>
54	<RegisterForComInterop>False</RegisterForComInterop>	54	<RegisterForComInterop>False</RegisterForComInterop>
55	<RemoveIntegerChecks>False</RemoveIntegerChecks>	55	<RemoveIntegerChecks>False</RemoveIntegerChecks>
56	<TreatWarningsAsErrors>False</TreatWarningsAsErrors>	56	<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
59	</PropertyGroup>	59	</PropertyGroup>
60	<ItemGroup>	60	<ItemGroup>
61	<Reference Include="Db4objects.Db4o.dll" >	61	<Reference Include="Db4objects.Db4o.dll" >
62	<HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>	62	<HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
63	<Private>False</Private>	63	<Private>False</Private>
64	</Reference>	64	</Reference>
65	<Reference Include="libsecondlife.dll" >	65	<Reference Include="libsecondlife.dll" >
66	<HintPath>..\..\bin\libsecondlife.dll</HintPath>	66	<HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
67	<Private>False</Private>	67	<Private>False</Private>
68	</Reference>	68	</Reference>
69	<Reference Include="OpenSim.Framework" >	69	<Reference Include="OpenSim.Framework" >
@@ -74,12 +74,12 @@
74	<HintPath>OpenSim.Framework.Console.dll</HintPath>	74	<HintPath>OpenSim.Framework.Console.dll</HintPath>
75	<Private>False</Private>	75	<Private>False</Private>
76	</Reference>	76	</Reference>
77	<Reference Include="OpenSim.GenericConfig.Xml" >	77	<Reference Include="OpenSim.Framework.GenericConfig.Xml" >
78	<HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>	78	<HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
79	<Private>False</Private>	79	<Private>False</Private>
80	</Reference>	80	</Reference>
81	<Reference Include="OpenSim.Servers" >	81	<Reference Include="OpenSim.Framework.Servers" >
82	<HintPath>OpenSim.Servers.dll</HintPath>	82	<HintPath>OpenSim.Framework.Servers.dll</HintPath>
83	<Private>False</Private>	83	<Private>False</Private>
84	</Reference>	84	</Reference>
85	<Reference Include="System" >	85	<Reference Include="System" >
@@ -94,21 +94,21 @@
94	<HintPath>System.Xml.dll</HintPath>	94	<HintPath>System.Xml.dll</HintPath>
95	<Private>False</Private>	95	<Private>False</Private>
96	</Reference>	96	</Reference>
97	<Reference Include="XMLRPC" >	97	<Reference Include="XMLRPC.dll" >
98	<HintPath>XMLRPC.dll</HintPath>	98	<HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
99	<Private>False</Private>	99	<Private>False</Private>
100	</Reference>	100	</Reference>
101	</ItemGroup>	101	</ItemGroup>
102	<ItemGroup>	102	<ItemGroup>
103	<ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">	103	<ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
104	<Name>OpenGrid.Framework.Data</Name>	104	<Name>OpenSim.Framework.Data</Name>
105	<Project>{62CDF671-0000-0000-0000-000000000000}</Project>	105	<Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
106	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>	106	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107	<Private>False</Private>	107	<Private>False</Private>
108	</ProjectReference>	108	</ProjectReference>
109	<ProjectReference Include="..\OpenGrid.Framework.Manager\OpenGrid.Framework.Manager.csproj">	109	<ProjectReference Include="..\Framework.Manager\OpenSim.Grid.Framework.Manager.csproj">
110	<Name>OpenGrid.Framework.Manager</Name>	110	<Name>OpenSim.Grid.Framework.Manager</Name>
111	<Project>{7924FD35-0000-0000-0000-000000000000}</Project>	111	<Project>{4B7BFD1C-0000-0000-0000-000000000000}</Project>
112	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>	112	<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
113	<Private>False</Private>	113	<Private>False</Private>
114	</ProjectReference>	114	</ProjectReference>