4 files changed, 19 insertions, 19 deletions

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
index b49c8da..b49c8da 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
index aa89cc1..77da908 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.csproj
@@ -3,20 +3,20 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{988F0AC4-0000-0000-0000-000000000000}</ProjectGuid>

+    <ProjectGuid>{A6D191D8-0000-0000-0000-000000000000}</ProjectGuid>

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

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

     <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

-    <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName>

+    <AssemblyName>OpenSim.Region.Physics.PhysXPlugin</AssemblyName>

     <DefaultClientScript>JScript</DefaultClientScript>

     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

     <AppDesignerFolder></AppDesignerFolder>

-    <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace>

+    <RootNamespace>OpenSim.Region.Physics.PhysXPlugin</RootNamespace>

     <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

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

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

+    <OutputPath>..\..\..\..\bin\Physics\</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\Physics\</OutputPath>

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

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -59,11 +59,11 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="Axiom.MathLib.dll" >

-      <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>

+      <HintPath>..\..\..\..\bin\Axiom.MathLib.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="PhysX_Wrapper_Dotnet.dll" >

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

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

       <Private>False</Private>

     </Reference>

     <Reference Include="System" >

@@ -72,9 +72,9 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">

-      <Name>OpenSim.Physics.Manager</Name>

-      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

+    <ProjectReference Include="..\Manager\OpenSim.Region.Physics.Manager.csproj">

+      <Name>OpenSim.Region.Physics.Manager</Name>

+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>

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

                         <Private>False</Private>

     </ProjectReference>

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
index be7a847..c1a9608 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim/Region/Physics/PhysXPlugin/OpenSim.Region.Physics.PhysXPlugin.dll.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>

-<project name="OpenSim.Physics.PhysXPlugin" default="build">

+<project name="OpenSim.Region.Physics.PhysXPlugin" 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="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >

+            <resources prefix="OpenSim.Region.Physics.PhysXPlugin" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

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

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

                 </lib>

-                <include name="../../../bin/Axiom.MathLib.dll" />

-                <include name="../../../bin/OpenSim.Physics.Manager.dll" />

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

+                <include name="../../../../bin/Axiom.MathLib.dll" />

+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />

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

                 <include name="System.dll" />

             </references>

         </csc>

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

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

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

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

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

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

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

                 <include name="*.dll"/>

                 <include name="*.exe"/>

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 200b232..8bf794b 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using OpenSim.Physics.Manager;

 using PhysXWrapper;

 

-namespace OpenSim.Physics.PhysXPlugin

+namespace OpenSim.Region.Physics.PhysXPlugin

 {

         /// <summary>

         /// Will be the PhysX plugin but for now will be a very basic physics engine