Attempt to rearrange some of the directories

38 files changed, 85 insertions, 100 deletions

diff --git a/OpenSim.Scripting.EmbeddedJVM/ClassInstance.cs b/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
index 15ef814..15ef814 100644
--- a/OpenSim.Scripting.EmbeddedJVM/ClassInstance.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/ClassRecord.cs b/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
index 15d8a4b..15d8a4b 100644
--- a/OpenSim.Scripting.EmbeddedJVM/ClassRecord.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Heap.cs b/OpenSim.Scripting/EmbeddedJVM/Heap.cs
index 138e85e..138e85e 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Heap.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Heap.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Interpreter.cs b/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
index b94248c..b94248c 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Interpreter.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/InterpreterLogic.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
index 3b7da35..3b7da35 100644
--- a/OpenSim.Scripting.EmbeddedJVM/InterpreterLogic.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/InterpreterMethods.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index dc3402e..dc3402e 100644
--- a/OpenSim.Scripting.EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/InterpreterReturn.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
index 6704e31..6704e31 100644
--- a/OpenSim.Scripting.EmbeddedJVM/InterpreterReturn.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/MainMemory.cs b/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
index ff18f90..ff18f90 100644
--- a/OpenSim.Scripting.EmbeddedJVM/MainMemory.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/MethodMemory.cs b/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
index 2541991..2541991 100644
--- a/OpenSim.Scripting.EmbeddedJVM/MethodMemory.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Object.cs b/OpenSim.Scripting/EmbeddedJVM/Object.cs
index e6e392c..e6e392c 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Object.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Object.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 90aeff8..a1e95f4 100644
--- a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

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

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

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -68,7 +68,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

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

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

       <Name>OpenSim.Framework</Name>

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

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

diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
index ea58087..e1615f7 100644
--- a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
+++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>

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

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

-    <ReferencePath>C:\Documents and Settings\Stefan\My Documents\source\opensim\trunk\bin\</ReferencePath>

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim11-04trunk\bin\</ReferencePath>

     <LastOpenVersion>8.0.50727</LastOpenVersion>

     <ProjectView>ProjectFiles</ProjectView>

     <ProjectTrust>0</ProjectTrust>

diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index 46067c1..ae79c83 100644
--- a/OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -41,12 +41,12 @@
                 </lib>

                 <include name="System.dll" />

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

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

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

             </references>

         </csc>

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

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

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

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

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

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

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

                 <include name="*.dll"/>

                 <include name="*.exe"/>

diff --git a/OpenSim.Scripting.EmbeddedJVM/OpenSimJVM.cs b/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
index b47bb50..b47bb50 100644
--- a/OpenSim.Scripting.EmbeddedJVM/OpenSimJVM.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Properties/AssemblyInfo.cs b/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
index 53a0f08..53a0f08 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Properties/AssemblyInfo.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Stack.cs b/OpenSim.Scripting/EmbeddedJVM/Stack.cs
index d77d82e..d77d82e 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Stack.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Stack.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/StackFrame.cs b/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
index afca7a9..afca7a9 100644
--- a/OpenSim.Scripting.EmbeddedJVM/StackFrame.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Thread.cs b/OpenSim.Scripting/EmbeddedJVM/Thread.cs
index 436949c..436949c 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Thread.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Thread.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/ArrayReference.cs b/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
index 2854eab..2854eab 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Types/ArrayReference.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/BaseType.cs b/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
index 270aa7b..270aa7b 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Types/BaseType.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/ObjectReference.cs b/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
index da28eaa..da28eaa 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Types/ObjectReference.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Byte.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
index 1a3ecff..1a3ecff 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Char.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
index 19002d4..19002d4 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Char.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Float.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
index 91f1679..91f1679 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Float.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
diff --git a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Int.cs b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
index 4ecd325..4ecd325 100644
--- a/OpenSim.Scripting.EmbeddedJVM/Types/PrimitiveTypes/Int.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/Properties/AssemblyInfo.cs b/OpenSim.Storage.LocalStorageBerkeleyDB/Properties/AssemblyInfo.cs
deleted file mode 100644
index 94f553a..0000000
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-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("OpenSim.Storage.LocalStorageBerkeleyDB")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenSim.Storage.LocalStorageBerkeleyDB")]

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

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("e8d6c27e-1feb-4cff-b029-51c701b9330b")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index db7252b..db7252b 100644
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
index ebd3936..12c5016 100644
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
@@ -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>

@@ -71,26 +71,26 @@
       <Private>False</Private>

     </Reference>

     <Reference Include="Kds.Serialization.dll" >

-      <HintPath>..\bin\Kds.Serialization.dll</HintPath>

+      <HintPath>..\..\bin\Kds.Serialization.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="libdb_dotNET43.dll" >

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

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

       <Private>False</Private>

     </Reference>

     <Reference Include="libsecondlife.dll" >

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

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

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

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

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

       <Name>OpenSim.Framework</Name>

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

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

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

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

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

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

@@ -101,9 +101,6 @@
     <Compile Include="BDBLocalStorage.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Properties\AssemblyInfo.cs">

-      <SubType>Code</SubType>

-    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
new file mode 100644
index 0000000..e1615f7
--- /dev/null
+++ b/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim11-04trunk\bin\</ReferencePath>

+    <LastOpenVersion>8.0.50727</LastOpenVersion>

+    <ProjectView>ProjectFiles</ProjectView>

+    <ProjectTrust>0</ProjectTrust>

+  </PropertyGroup>

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

+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

+</Project>

diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index 82085d1..885b088 100644
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
@@ -12,7 +12,6 @@
             </resources>

             <sources failonempty="true">

                 <include name="BDBLocalStorage.cs" />

-                <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

@@ -22,16 +21,16 @@
                 <include name="System.dll" />

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

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

-                <include name="../bin/Kds.Serialization.dll" />

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

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

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

-                <include name="../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../bin/Kds.Serialization.dll" />

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

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

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

+                <include name="../../bin/OpenSim.Framework.Console.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/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
index a6facb9..8039721 100644
--- a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
+++ b/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
@@ -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>

@@ -71,22 +71,22 @@
       <Private>False</Private>

     </Reference>

     <Reference Include="System.Data.SQLite.dll" >

-      <HintPath>..\bin\System.Data.SQLite.dll</HintPath>

+      <HintPath>..\..\bin\System.Data.SQLite.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="libsecondlife.dll" >

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

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

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

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

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

       <Name>OpenSim.Framework</Name>

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

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

                         <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

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

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

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

diff --git a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
new file mode 100644
index 0000000..e1615f7
--- /dev/null
+++ b/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim11-04trunk\bin\</ReferencePath>

+    <LastOpenVersion>8.0.50727</LastOpenVersion>

+    <ProjectView>ProjectFiles</ProjectView>

+    <ProjectTrust>0</ProjectTrust>

+  </PropertyGroup>

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

+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

+</Project>

diff --git a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index f3a6683..79c27fc 100644
--- a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
@@ -22,15 +22,15 @@
                 <include name="System.dll" />

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

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

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

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

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

-                <include name="../bin/OpenSim.Framework.Console.dll" />

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

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

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

+                <include name="../../bin/OpenSim.Framework.Console.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/OpenSim.Storage.LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index fe81f8a..fe81f8a 100644
--- a/OpenSim.Storage.LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Storage.LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 8c9a5e1..8c9a5e1 100644
--- a/OpenSim.Storage.LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
diff --git a/OpenSim.build b/OpenSim.build
index 861a466..2c20042 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -50,11 +50,11 @@
         <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />

         <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />

         <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />

-        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />

+        <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />

         <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />

         <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />

         <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />

-        <nant buildfile="OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />

+        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />

         <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />

         <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />

         <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />

@@ -63,7 +63,7 @@
         <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />

         <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />

         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />

-        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />

+        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />

         <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />

         <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />

         <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />

@@ -84,13 +84,13 @@
         <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />

         <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />

         <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />

-        <nant buildfile="OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="build" />

+        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="build" />

         <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />

         <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />

         <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />

         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />

-        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />

-        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />

+        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />

+        <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />

     </target>

 

     <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />

@@ -105,11 +105,11 @@
         <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />

         <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />

         <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />

-        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />

+        <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />

         <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />

         <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />

         <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />

-        <nant buildfile="OpenSim.Scripting.EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />

+        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />

         <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />

         <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />

         <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />

@@ -118,7 +118,7 @@
         <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />

         <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />

         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />

-        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />

+        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />

         <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />

         <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />

         <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />

diff --git a/OpenSim.sln b/OpenSim.sln
index 875bb3b..5ad18e3 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+# Visual C# Express 2005

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"

@@ -8,7 +8,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin",
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage.LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"

 EndProject

@@ -16,7 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml",
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim.Scripting.EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Scripting.EmbeddedJVM", "OpenSim.Scripting\EmbeddedJVM\OpenSim.Scripting.EmbeddedJVM.csproj", "{97A82740-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}"

 EndProject

@@ -34,7 +34,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim.Storage.LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageSQLite", "OpenSim.Storage\LocalStorageSQLite\OpenSim.Storage.LocalStorageSQLite.csproj", "{6B20B603-0000-0000-0000-000000000000}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"

 EndProject

diff --git a/prebuild.xml b/prebuild.xml
index 06b6eaa..b000ae7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -368,19 +368,19 @@
     </Project>

 

         <!-- Basic embedded JVM -->

-     <Project name="OpenSim.Scripting.EmbeddedJVM" path="OpenSim.Scripting.EmbeddedJVM" type="Library">

+     <Project name="OpenSim.Scripting.EmbeddedJVM" path="OpenSim.Scripting/EmbeddedJVM" type="Library">

       <Configuration name="Debug">

         <Options>

-          <OutputPath>../bin/ScriptEngines/</OutputPath>

+          <OutputPath>../../bin/ScriptEngines/</OutputPath>

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

-          <OutputPath>../bin/ScriptEngines/</OutputPath>

+          <OutputPath>../../bin/ScriptEngines/</OutputPath>

         </Options>

       </Configuration>

 

-      <ReferencePath>../bin/</ReferencePath>

+      <ReferencePath>../../bin/</ReferencePath>

       <Reference name="System"/>

       <Reference name="System.Xml"/>

      <Reference name="OpenSim.Framework"/>

@@ -500,19 +500,19 @@
       </Files>

     </Project>

     

-    <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim.Storage.LocalStorageSQLite" type="Library">

+    <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim.Storage/LocalStorageSQLite" type="Library">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

-      <ReferencePath>../bin/</ReferencePath>

+      <ReferencePath>../../bin/</ReferencePath>

       <Reference name="System" localCopy="false"/>

       <Reference name="System.Xml"/>

       <Reference name="System.Data"/>

@@ -525,19 +525,19 @@
       </Files>

     </Project>

 

-    <Project name="OpenSim.Storage.LocalStorageBerkeleyDB" path="OpenSim.Storage.LocalStorageBerkeleyDB" type="Library">

+    <Project name="OpenSim.Storage.LocalStorageBerkeleyDB" path="OpenSim.Storage/LocalStorageBerkeleyDB" type="Library">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

-      <ReferencePath>../bin/</ReferencePath>

+      <ReferencePath>../../bin/</ReferencePath>

       <Reference name="System" localCopy="false"/>

       <Reference name="System.Xml"/>

       <Reference name="System.Data"/>