Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.

310 files changed, 1739 insertions, 939 deletions

diff --git a/OpenSim.Framework.Console/AssemblyInfo.cs b/Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs
index 00a9b7d..00a9b7d 100644
--- a/OpenSim.Framework.Console/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/Common-Source/OpenSim.Framework.Console/ConsoleBase.cs
index 6a1c53c..6a1c53c 100644
--- a/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common-Source/OpenSim.Framework.Console/ConsoleBase.cs
diff --git a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
index bb589d2..bb589d2 100644
--- a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
+++ b/Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
diff --git a/OpenSim.Framework.Console/MainConsole.cs b/Common-Source/OpenSim.Framework.Console/MainConsole.cs
index 02c4ae8..02c4ae8 100644
--- a/OpenSim.Framework.Console/MainConsole.cs
+++ b/Common-Source/OpenSim.Framework.Console/MainConsole.cs
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 0961492..0961492 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
diff --git a/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.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\opensim15-07\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.Framework.Console/OpenSim.Framework.Console.dll.build b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index fa90bb6..fa90bb6 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
diff --git a/OpenSim.Framework/AgentInventory.cs b/Common-Source/OpenSim.Framework/AgentInventory.cs
index b28645e..b28645e 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/Common-Source/OpenSim.Framework/AgentInventory.cs
diff --git a/OpenSim.Framework/BlockingQueue.cs b/Common-Source/OpenSim.Framework/BlockingQueue.cs
index f840354..f840354 100644
--- a/OpenSim.Framework/BlockingQueue.cs
+++ b/Common-Source/OpenSim.Framework/BlockingQueue.cs
diff --git a/OpenSim.Framework/HeightMapGenHills.cs b/Common-Source/OpenSim.Framework/HeightMapGenHills.cs
index 6a729da..6a729da 100644
--- a/OpenSim.Framework/HeightMapGenHills.cs
+++ b/Common-Source/OpenSim.Framework/HeightMapGenHills.cs
diff --git a/OpenSim.Framework/Interfaces/IAssetServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs
index 3f86acc..3f86acc 100644
--- a/OpenSim.Framework/Interfaces/IAssetServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs
new file mode 100644
index 0000000..a991fb6
--- /dev/null
+++ b/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -0,0 +1,30 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework.Inventory;

+using libsecondlife;

+using libsecondlife.Packets;

+using OpenSim.Framework.Types;

+

+namespace OpenSim.Framework.Interfaces

+{

+    public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

+    public delegate void RezObject(AssetBase primAsset, LLVector3 pos);

+    public delegate void ModifyTerrain(byte action, float north, float west);

+    public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);

+    public delegate void StartAnim(LLUUID animID, int seq);

+    public delegate void LinkObjects(uint parent, List<uint> children);

+

+    public interface IClientAPI

+    {

+        event ChatFromViewer OnChatFromViewer;

+        event RezObject OnRezObject;

+        event ModifyTerrain OnModifyTerrain;

+        event SetAppearance OnSetAppearance;

+        event StartAnim OnStartAnim;

+        event LinkObjects OnLinkObjects;

+

+        void SendAppearance(AvatarWearable[] wearables);

+        void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

+    }

+}

diff --git a/OpenSim.Framework/Interfaces/IConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IConfig.cs
index 7b4c040..7b4c040 100644
--- a/OpenSim.Framework/Interfaces/IConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGenericConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/OpenSim.Framework/Interfaces/IGenericConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGridConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/OpenSim.Framework/Interfaces/IGridConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGridServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs
index e67ea98..e67ea98 100644
--- a/OpenSim.Framework/Interfaces/IGridServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs
diff --git a/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 4dd8868..4dd8868 100644
--- a/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs
diff --git a/OpenSim.Framework/Interfaces/IScriptAPI.cs b/Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs
index 3ad0f06..3ad0f06 100644
--- a/OpenSim.Framework/Interfaces/IScriptAPI.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs
diff --git a/OpenSim.Framework/Interfaces/IScriptEngine.cs b/Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/OpenSim.Framework/Interfaces/IScriptEngine.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/Interfaces/IUserConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs
index e15867d..e15867d 100644
--- a/OpenSim.Framework/Interfaces/IUserConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IUserServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs
index 21f2721..21f2721 100644
--- a/OpenSim.Framework/Interfaces/IUserServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/Interfaces/LocalGridBase.cs b/Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs
index ff46502..ff46502 100644
--- a/OpenSim.Framework/Interfaces/LocalGridBase.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs
diff --git a/OpenSim.Framework/Interfaces/RemoteGridBase.cs b/Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs
index ed13ed5..ed13ed5 100644
--- a/OpenSim.Framework/Interfaces/RemoteGridBase.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs
diff --git a/OpenSim.Framework/LoginService.cs b/Common-Source/OpenSim.Framework/LoginService.cs
index eba0281..eba0281 100644
--- a/OpenSim.Framework/LoginService.cs
+++ b/Common-Source/OpenSim.Framework/LoginService.cs
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj
index c2f01d8..1b7f3c0 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Framework</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Framework</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,22 +61,24 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml">

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -80,7 +88,7 @@
       <Name>XMLRPC</Name>

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

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -93,6 +101,7 @@
     <Compile Include="HeightMapGenHills.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Interfaces\IClientAPI.cs" />

     <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -188,4 +197,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.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\opensim15-07\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.Framework/OpenSim.Framework.dll.build b/Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build
index 77d5ce9..fecd382 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -23,6 +23,7 @@
                 <include name="UserProfileManagerBase.cs" />

                 <include name="Util.cs" />

                 <include name="Interfaces/IAssetServer.cs" />

+                <include name="Interfaces/IClientAPI.cs" />

                 <include name="Interfaces/IConfig.cs" />

                 <include name="Interfaces/IGenericConfig.cs" />

                 <include name="Interfaces/IGridConfig.cs" />

diff --git a/OpenSim.Framework/Properties/AssemblyInfo.cs b/Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs
index 86f5cdb..86f5cdb 100644
--- a/OpenSim.Framework/Properties/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Framework/Remoting.cs b/Common-Source/OpenSim.Framework/Remoting.cs
index 1212ee5..1212ee5 100644
--- a/OpenSim.Framework/Remoting.cs
+++ b/Common-Source/OpenSim.Framework/Remoting.cs
diff --git a/OpenSim.Framework/SimProfile.cs b/Common-Source/OpenSim.Framework/SimProfile.cs
index 8acb20b..8acb20b 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/Common-Source/OpenSim.Framework/SimProfile.cs
diff --git a/OpenSim.Framework/SimProfileBase.cs b/Common-Source/OpenSim.Framework/SimProfileBase.cs
index 30e2e0f..30e2e0f 100644
--- a/OpenSim.Framework/SimProfileBase.cs
+++ b/Common-Source/OpenSim.Framework/SimProfileBase.cs
diff --git a/OpenSim.Framework/Types/AgentCiruitData.cs b/Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs
index 7314586..7314586 100644
--- a/OpenSim.Framework/Types/AgentCiruitData.cs
+++ b/Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs
diff --git a/OpenSim.Framework/Types/AssetBase.cs b/Common-Source/OpenSim.Framework/Types/AssetBase.cs
index f6104f8..f6104f8 100644
--- a/OpenSim.Framework/Types/AssetBase.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetBase.cs
diff --git a/OpenSim.Framework/Types/AssetLandmark.cs b/Common-Source/OpenSim.Framework/Types/AssetLandmark.cs
index 9d1a326..9d1a326 100644
--- a/OpenSim.Framework/Types/AssetLandmark.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetLandmark.cs
diff --git a/OpenSim.Framework/Types/AssetStorage.cs b/Common-Source/OpenSim.Framework/Types/AssetStorage.cs
index 5b5b3b2..5b5b3b2 100644
--- a/OpenSim.Framework/Types/AssetStorage.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetStorage.cs
diff --git a/OpenSim.Framework/Types/Login.cs b/Common-Source/OpenSim.Framework/Types/Login.cs
index 71f9de3..71f9de3 100644
--- a/OpenSim.Framework/Types/Login.cs
+++ b/Common-Source/OpenSim.Framework/Types/Login.cs
diff --git a/OpenSim.Framework/Types/NeighbourInfo.cs b/Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs
index 58b6cb1..58b6cb1 100644
--- a/OpenSim.Framework/Types/NeighbourInfo.cs
+++ b/Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs
diff --git a/OpenSim.Framework/Types/OSVector3.cs b/Common-Source/OpenSim.Framework/Types/OSVector3.cs
index 8fb840b..8fb840b 100644
--- a/OpenSim.Framework/Types/OSVector3.cs
+++ b/Common-Source/OpenSim.Framework/Types/OSVector3.cs
diff --git a/OpenSim.Framework/Types/PrimData.cs b/Common-Source/OpenSim.Framework/Types/PrimData.cs
index 68e2a22..68e2a22 100644
--- a/OpenSim.Framework/Types/PrimData.cs
+++ b/Common-Source/OpenSim.Framework/Types/PrimData.cs
diff --git a/OpenSim.Framework/UserProfile.cs b/Common-Source/OpenSim.Framework/UserProfile.cs
index f95a8fa..f95a8fa 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/Common-Source/OpenSim.Framework/UserProfile.cs
diff --git a/OpenSim.Framework/UserProfileManager.cs b/Common-Source/OpenSim.Framework/UserProfileManager.cs
index 18b3513..18b3513 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/Common-Source/OpenSim.Framework/UserProfileManager.cs
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/Common-Source/OpenSim.Framework/UserProfileManagerBase.cs
index d1307a5..d1307a5 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/Common-Source/OpenSim.Framework/UserProfileManagerBase.cs
diff --git a/OpenSim.Framework/Util.cs b/Common-Source/OpenSim.Framework/Util.cs
index 400f415..400f415 100644
--- a/OpenSim.Framework/Util.cs
+++ b/Common-Source/OpenSim.Framework/Util.cs
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
index 98e813e..98e813e 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
diff --git a/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.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\opensim15-07\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.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
index f34e4ac..f34e4ac 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/Common-Source/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
diff --git a/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs b/Common-Source/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
index de5f48d..de5f48d 100644
--- a/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.GenericConfig/Xml/Properties/AssemblyInfo.cs
diff --git a/OpenSim.GenericConfig/Xml/XmlConfig.cs b/Common-Source/OpenSim.GenericConfig/Xml/XmlConfig.cs
index 62e3cbf..62e3cbf 100644
--- a/OpenSim.GenericConfig/Xml/XmlConfig.cs
+++ b/Common-Source/OpenSim.GenericConfig/Xml/XmlConfig.cs
diff --git a/OpenSim.Servers/BaseHttpServer.cs b/Common-Source/OpenSim.Servers/BaseHttpServer.cs
index 38f4370..38f4370 100644
--- a/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common-Source/OpenSim.Servers/BaseHttpServer.cs
diff --git a/OpenSim.Servers/BaseServer.cs b/Common-Source/OpenSim.Servers/BaseServer.cs
index 0a4c498..0a4c498 100644
--- a/OpenSim.Servers/BaseServer.cs
+++ b/Common-Source/OpenSim.Servers/BaseServer.cs
diff --git a/OpenSim.Servers/CheckSumServer.cs b/Common-Source/OpenSim.Servers/CheckSumServer.cs
index ae1724f..ae1724f 100644
--- a/OpenSim.Servers/CheckSumServer.cs
+++ b/Common-Source/OpenSim.Servers/CheckSumServer.cs
diff --git a/OpenSim.Servers/IRestHandler.cs b/Common-Source/OpenSim.Servers/IRestHandler.cs
index c322505..c322505 100644
--- a/OpenSim.Servers/IRestHandler.cs
+++ b/Common-Source/OpenSim.Servers/IRestHandler.cs
diff --git a/OpenSim.Servers/LocalUserProfileManager.cs b/Common-Source/OpenSim.Servers/LocalUserProfileManager.cs
index a8b5f1f..a8b5f1f 100644
--- a/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/Common-Source/OpenSim.Servers/LocalUserProfileManager.cs
diff --git a/OpenSim.Servers/LoginResponse.cs b/Common-Source/OpenSim.Servers/LoginResponse.cs
index 7333d1f..7333d1f 100644
--- a/OpenSim.Servers/LoginResponse.cs
+++ b/Common-Source/OpenSim.Servers/LoginResponse.cs
diff --git a/OpenSim.Servers/LoginServer.cs b/Common-Source/OpenSim.Servers/LoginServer.cs
index 6fd174b..6fd174b 100644
--- a/OpenSim.Servers/LoginServer.cs
+++ b/Common-Source/OpenSim.Servers/LoginServer.cs
diff --git a/OpenSim.Servers/OpenSim.Servers.csproj b/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj
index 72f637b..72f637b 100644
--- a/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj
diff --git a/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common-Source/OpenSim.Servers/OpenSim.Servers.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Servers/OpenSim.Servers.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\opensim15-07\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.Servers/OpenSim.Servers.dll.build b/Common-Source/OpenSim.Servers/OpenSim.Servers.dll.build
index 5afd9e1..5afd9e1 100644
--- a/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common-Source/OpenSim.Servers/OpenSim.Servers.dll.build
diff --git a/OpenSim.Servers/UDPServerBase.cs b/Common-Source/OpenSim.Servers/UDPServerBase.cs
index a308052..a308052 100644
--- a/OpenSim.Servers/UDPServerBase.cs
+++ b/Common-Source/OpenSim.Servers/UDPServerBase.cs
diff --git a/OpenSim.Servers/XmlRpcMethod.cs b/Common-Source/OpenSim.Servers/XmlRpcMethod.cs
index 2295405..2295405 100644
--- a/OpenSim.Servers/XmlRpcMethod.cs
+++ b/Common-Source/OpenSim.Servers/XmlRpcMethod.cs
diff --git a/XmlRpcCS/Logger.cs b/Common-Source/XmlRpcCS/Logger.cs
index ebf804b..ebf804b 100644
--- a/XmlRpcCS/Logger.cs
+++ b/Common-Source/XmlRpcCS/Logger.cs
diff --git a/XmlRpcCS/SimpleHttpRequest.cs b/Common-Source/XmlRpcCS/SimpleHttpRequest.cs
index e5326c3..e5326c3 100644
--- a/XmlRpcCS/SimpleHttpRequest.cs
+++ b/Common-Source/XmlRpcCS/SimpleHttpRequest.cs
diff --git a/XmlRpcCS/XMLRPC.csproj b/Common-Source/XmlRpcCS/XMLRPC.csproj
index 2c7ef94..2c7ef94 100644
--- a/XmlRpcCS/XMLRPC.csproj
+++ b/Common-Source/XmlRpcCS/XMLRPC.csproj
diff --git a/Common-Source/XmlRpcCS/XMLRPC.csproj.user b/Common-Source/XmlRpcCS/XMLRPC.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/XmlRpcCS/XMLRPC.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\opensim15-07\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/XmlRpcCS/XMLRPC.dll.build b/Common-Source/XmlRpcCS/XMLRPC.dll.build
index d734d19..d734d19 100644
--- a/XmlRpcCS/XMLRPC.dll.build
+++ b/Common-Source/XmlRpcCS/XMLRPC.dll.build
diff --git a/XmlRpcCS/XmlRpcBoxcarRequest.cs b/Common-Source/XmlRpcCS/XmlRpcBoxcarRequest.cs
index f87f7a5..f87f7a5 100644
--- a/XmlRpcCS/XmlRpcBoxcarRequest.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcBoxcarRequest.cs
diff --git a/XmlRpcCS/XmlRpcClientProxy.cs b/Common-Source/XmlRpcCS/XmlRpcClientProxy.cs
index f52273a..f52273a 100644
--- a/XmlRpcCS/XmlRpcClientProxy.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcClientProxy.cs
diff --git a/XmlRpcCS/XmlRpcDeserializer.cs b/Common-Source/XmlRpcCS/XmlRpcDeserializer.cs
index bd736c0..bd736c0 100644
--- a/XmlRpcCS/XmlRpcDeserializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcDeserializer.cs
diff --git a/XmlRpcCS/XmlRpcErrorCodes.cs b/Common-Source/XmlRpcCS/XmlRpcErrorCodes.cs
index 6dec57d..6dec57d 100644
--- a/XmlRpcCS/XmlRpcErrorCodes.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcErrorCodes.cs
diff --git a/XmlRpcCS/XmlRpcException.cs b/Common-Source/XmlRpcCS/XmlRpcException.cs
index fd1f4ae..fd1f4ae 100644
--- a/XmlRpcCS/XmlRpcException.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcException.cs
diff --git a/XmlRpcCS/XmlRpcExposedAttribute.cs b/Common-Source/XmlRpcCS/XmlRpcExposedAttribute.cs
index 67b27ae..67b27ae 100644
--- a/XmlRpcCS/XmlRpcExposedAttribute.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcExposedAttribute.cs
diff --git a/XmlRpcCS/XmlRpcRequest.cs b/Common-Source/XmlRpcCS/XmlRpcRequest.cs
index 18d2182..18d2182 100644
--- a/XmlRpcCS/XmlRpcRequest.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcRequest.cs
diff --git a/XmlRpcCS/XmlRpcRequestDeserializer.cs b/Common-Source/XmlRpcCS/XmlRpcRequestDeserializer.cs
index 0770b7e..0770b7e 100644
--- a/XmlRpcCS/XmlRpcRequestDeserializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcRequestDeserializer.cs
diff --git a/XmlRpcCS/XmlRpcRequestSerializer.cs b/Common-Source/XmlRpcCS/XmlRpcRequestSerializer.cs
index 8099bdb..8099bdb 100644
--- a/XmlRpcCS/XmlRpcRequestSerializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcRequestSerializer.cs
diff --git a/XmlRpcCS/XmlRpcResponder.cs b/Common-Source/XmlRpcCS/XmlRpcResponder.cs
index 0412568..0412568 100644
--- a/XmlRpcCS/XmlRpcResponder.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponder.cs
diff --git a/XmlRpcCS/XmlRpcResponse.cs b/Common-Source/XmlRpcCS/XmlRpcResponse.cs
index 8ff8354..8ff8354 100644
--- a/XmlRpcCS/XmlRpcResponse.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponse.cs
diff --git a/XmlRpcCS/XmlRpcResponseDeserializer.cs b/Common-Source/XmlRpcCS/XmlRpcResponseDeserializer.cs
index 032d8a3..032d8a3 100644
--- a/XmlRpcCS/XmlRpcResponseDeserializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponseDeserializer.cs
diff --git a/XmlRpcCS/XmlRpcResponseSerializer.cs b/Common-Source/XmlRpcCS/XmlRpcResponseSerializer.cs
index 72ca568..72ca568 100644
--- a/XmlRpcCS/XmlRpcResponseSerializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcResponseSerializer.cs
diff --git a/XmlRpcCS/XmlRpcSerializer.cs b/Common-Source/XmlRpcCS/XmlRpcSerializer.cs
index 0643d38..0643d38 100644
--- a/XmlRpcCS/XmlRpcSerializer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcSerializer.cs
diff --git a/XmlRpcCS/XmlRpcServer.cs b/Common-Source/XmlRpcCS/XmlRpcServer.cs
index 1c226c1..1c226c1 100644
--- a/XmlRpcCS/XmlRpcServer.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcServer.cs
diff --git a/XmlRpcCS/XmlRpcSystemObject.cs b/Common-Source/XmlRpcCS/XmlRpcSystemObject.cs
index 5f79951..5f79951 100644
--- a/XmlRpcCS/XmlRpcSystemObject.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcSystemObject.cs
diff --git a/XmlRpcCS/XmlRpcXmlTokens.cs b/Common-Source/XmlRpcCS/XmlRpcXmlTokens.cs
index 50788bd..50788bd 100644
--- a/XmlRpcCS/XmlRpcXmlTokens.cs
+++ b/Common-Source/XmlRpcCS/XmlRpcXmlTokens.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
index b5065bc..b5065bc 100644
--- a/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/AssemblyInfo.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
index 2d00ca6..2d00ca6 100644
--- a/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/DbGridConfig.cs
diff --git a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
index 00d987b..00d987b 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.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\opensim15-07\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/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
index 61d3efd..61d3efd 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index 546713e..546713e 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
index aaa6e91..aaa6e91 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
index 7dd4c51..7dd4c51 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/DB4oUserData.cs
diff --git a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 02abc3e..02abc3e 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.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\opensim15-07\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/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index 144813b..144813b 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
diff --git a/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
index dc4a9a1..dc4a9a1 100644
--- a/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.DB4o/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
index 0925df1..0925df1 100644
--- a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
index 12c166c..12c166c 100644
--- a/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/MSSQLManager.cs
diff --git a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
index efb6a32..efb6a32 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.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\opensim15-07\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/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
index 61b1826..61b1826 100644
--- a/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build
diff --git a/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
index bbe3cdf..bbe3cdf 100644
--- a/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MSSQL/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
index 46183b4..46183b4 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index a476e97..a476e97 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
index 0741272..0741272 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/MySQLUserData.cs
diff --git a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index ae3d5c5..ae3d5c5 100644
--- a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.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\opensim15-07\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/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
index a390324..a390324 100644
--- a/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
diff --git a/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
index 0bfd1d6..0bfd1d6 100644
--- a/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.MySQL/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index ef2ecaa..ef2ecaa 100644
--- a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.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\opensim15-07\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/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
index d9a2369..d9a2369 100644
--- a/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
diff --git a/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
index 57c4bae..57c4bae 100644
--- a/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
index 4850f12..4850f12 100644
--- a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
diff --git a/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
index 408a582..408a582 100644
--- a/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
diff --git a/OpenGrid.Framework.Data/GridData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs
index 6dad37e..6dad37e 100644
--- a/OpenGrid.Framework.Data/GridData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/GridData.cs
diff --git a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 201f7ba..201f7ba 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.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\opensim15-07\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/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index a3fd771..a3fd771 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
diff --git a/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
index 1446673..1446673 100644
--- a/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/Properties/AssemblyInfo.cs
diff --git a/OpenGrid.Framework.Data/SimProfileData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs
index c66610e..c66610e 100644
--- a/OpenGrid.Framework.Data/SimProfileData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/SimProfileData.cs
diff --git a/OpenGrid.Framework.Data/UserData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs
index 1b37957..1b37957 100644
--- a/OpenGrid.Framework.Data/UserData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/UserData.cs
diff --git a/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs
index 3f42762..3f42762 100644
--- a/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Data/UserProfileData.cs
diff --git a/OpenGrid.Framework.Manager/GridManagementAgent.cs b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs
index e43ce87..e43ce87 100644
--- a/OpenGrid.Framework.Manager/GridManagementAgent.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridManagementAgent.cs
diff --git a/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs
index 7ebf66a..7ebf66a 100644
--- a/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/GridServerManager.cs
diff --git a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
index 3122633..3122633 100644
--- a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
diff --git a/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.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\opensim15-07\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/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
index daee3bf..daee3bf 100644
--- a/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
+++ b/OpenGridServices-Source/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
diff --git a/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs
index 8439e92..8439e92 100644
--- a/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/AssetHttpServer.cs
diff --git a/OpenGridServices.AssetServer/Main.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs
index 684d683..684d683 100644
--- a/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/Main.cs
diff --git a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index d01a52e..d01a52e 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.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\opensim15-07\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/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index cd76f22..cd76f22 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
diff --git a/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
index 9b8cc87..9b8cc87 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
index 6bef534..6bef534 100644
--- a/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
index 7014284..7014284 100644
--- a/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs
index 54e4bb7..54e4bb7 100644
--- a/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/GridManager.cs
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices-Source/OpenGridServices.GridServer/Main.cs
index cad5fae..cad5fae 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/Main.cs
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 5f3fc6f..5f3fc6f 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.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\opensim15-07\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/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 9ca4d4b..9ca4d4b 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
diff --git a/OpenGridServices.GridServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.GridServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.mds b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds
index ed7bc24..ed7bc24 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.mds
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.mds
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.userprefs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
index f221509..f221509 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.userprefs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager.usertasks b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
index d887d0e..d887d0e 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager.usertasks
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
index af4e275..af4e275 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/AssemblyInfo.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
index 83685fc..83685fc 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/BlockingQueue.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
index 0d509ef..0d509ef 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Connect to grid server.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
index 8a80b1d..8a80b1d 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index 6b632d6..6b632d6 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
index 42e09e0..42e09e0 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
index 1db38f0..1db38f0 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/MainWindow.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
index cfdc085..cfdc085 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.mdp
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
index 44e7a61..44e7a61 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/OpenGridServices.Manager.pidb
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
index 00f7c65..00f7c65 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/RegionBlock.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
index 5bf7ff9..5bf7ff9 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/Util.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
index da6739e..da6739e 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
index 8798dac..8798dac 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
index dd4abdd..dd4abdd 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/generated.cs
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
index c883f08..c883f08 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
+++ b/OpenGridServices-Source/OpenGridServices.Manager/OpenGridServices.Manager/gtk-gui/gui.stetic
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices-Source/OpenGridServices.UserServer/Main.cs
index 0eb314b..0eb314b 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/Main.cs
diff --git a/OpenGridServices.UserServer/OGS-UserServer.csproj b/OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj
index f4fa8b6..f4fa8b6 100644
--- a/OpenGridServices.UserServer/OGS-UserServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OGS-UserServer.csproj
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 9f4da40..9f4da40 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
diff --git a/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.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\opensim15-07\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/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 548c3cc..548c3cc 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
diff --git a/OpenGridServices.UserServer/Properties/AssemblyInfo.cs b/OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
index 5d5ce8d..5d5ce8d 100644
--- a/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/Properties/AssemblyInfo.cs
diff --git a/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs
index a312445..a312445 100644
--- a/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices-Source/OpenGridServices.UserServer/UserManager.cs
diff --git a/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
index 56a5535..56a5535 100644
--- a/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/AssemblyInfo.cs
diff --git a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
index a281889..a281889 100644
--- a/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/DbUserConfig.cs
diff --git a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
index 8c4fd39..8c4fd39 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
diff --git a/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.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\opensim15-07\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/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 8494a0b..8494a0b 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenGridServices-Source/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
diff --git a/SQL/mysql-agents.sql b/OpenGridServices-Source/SQL/mysql-agents.sql
index 8194ca9..8194ca9 100644
--- a/SQL/mysql-agents.sql
+++ b/OpenGridServices-Source/SQL/mysql-agents.sql
diff --git a/SQL/mysql-regions.sql b/OpenGridServices-Source/SQL/mysql-regions.sql
index 5392f7f..5392f7f 100644
--- a/SQL/mysql-regions.sql
+++ b/OpenGridServices-Source/SQL/mysql-regions.sql
diff --git a/SQL/mysql-users.sql b/OpenGridServices-Source/SQL/mysql-users.sql
index 5ce4d1c..5ce4d1c 100644
--- a/SQL/mysql-users.sql
+++ b/OpenGridServices-Source/SQL/mysql-users.sql
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.cs b/OpenGridServices-Source/ServiceManager/ServiceManager.cs
new file mode 100644
index 0000000..b21a5b1
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.ServiceProcess;
+using System.Xml;
+using System.IO;
+
+public class OpenGridMasterService : System.ServiceProcess.ServiceBase {
+
+        private Thread ServiceWorkerThread;
+
+        public OpenGridMasterService()
+        {
+                CanPauseAndContinue = false;
+                ServiceName = "OpenGridServices-master";
+        }
+
+        private void InitializeComponent()
+        {
+                this.CanPauseAndContinue = false;
+                this.CanShutdown = true;
+                this.ServiceName = "OpenGridServices-master";
+        }
+
+        protected override void OnStart(string[] args)
+        {
+                ServiceWorkerThread = new Thread(new ThreadStart(MainServiceThread));           
+                ServiceWorkerThread.Start();
+        }
+
+        protected override void OnStop()
+        {
+                ServiceWorkerThread.Abort();
+        }
+
+        private void MainServiceThread()
+        {
+         try {  
+            StreamReader reader=new  StreamReader("opengrid-master-cfg.xml");
+            
+            string configxml = reader.ReadToEnd();
+            XmlDocument doc = new XmlDocument();
+            doc.LoadXml(configxml);
+            XmlNode rootnode = doc.FirstChild;
+            if (rootnode.Name != "regions")
+            {
+                EventLog.WriteEntry("ERROR! bad XML in opengrid-master-cfg.xml - expected regions tag");
+                Console.WriteLine("Sorry, could not startup the service - please check your opengrid-master-cfg.xml file: missing regions tag");
+                (new ServiceController("OpenGridServices-master")).Stop();
+            }
+
+            for(int i=0; i<=rootnode.ChildNodes.Count; i++)
+            {
+                if(rootnode.ChildNodes.Item(i).Name != "region") {
+                        EventLog.WriteEntry("nonfatal error - unexpected tag inside regions block of opengrid-master-cfg.xml");
+                        (new ServiceController("OpenGridServices-master")).Stop();
+                }
+            }
+         } catch(Exception e) {
+            Console.WriteLine(e.ToString());
+            (new ServiceController("OpenGridServices-master")).Stop();
+         }
+        
+        }
+
+        private static string SetupGrid()
+        {
+                Console.WriteLine("Running external program (OpenGridServices.GridServer.exe) to configure the grid server");
+                Process p = new Process();
+
+                p.StartInfo.Arguments = "-setuponly"; 
+                p.StartInfo.FileName  = "OpenGridServices.GridServer.exe";
+                p.Start();
+
+                return "<gridserver />";        // we let the gridserver handle it's own setup
+        }
+
+        private static string SetupUser()
+        {
+                return "<user></user>";
+        }
+
+        private static string SetupAsset()
+        {
+                return "<asset></asset>";
+        }
+
+        private static string SetupRegion()
+        {
+                return "<regions></regions>";
+        }
+
+        public static void InitSetup()
+        {
+                string choice="";
+                
+                string GridInfo;
+                string UserInfo;
+                string AssetInfo;
+                string RegionInfo;
+
+                bool grid=false;
+                bool user=false;
+                bool asset=false;
+                bool region=false;
+                while(choice!="OK")
+                {
+                        Console.Clear();
+                        Console.WriteLine("Please select the components you would like to run on this server:\n");
+
+                        Console.WriteLine("1 - [" + (grid ? "X" : " ") + "] Grid server   - this service handles co-ordinates of regions/sims on the grid");
+                        Console.WriteLine("2 - [" + (user ? "X" : " ") + "] User server   - this service handles user login, profiles, inventory and IM");
+                        Console.WriteLine("3 - [" + (asset ? "X" : " ") + "] Asset server  - this service handles storage of assets such as textures, objects, sounds, scripts");
+                        Console.WriteLine("4 - [" + (region ? "X" : " ") + "] Region server - this is the main opensim server and can run without the above services, it handles physics simulation, terrain, building and other such features");
+                
+
+                        Console.Write("Type a number to toggle a choice or type OK to accept your current choices: ");
+                        choice = Console.ReadLine();
+                        switch(choice)
+                        {
+                                case "1":
+                                        grid = (!grid);
+                                break;
+
+                                case "2":
+                                        user = (!user);
+                                break;
+
+                                case "3":
+                                        asset = (!asset);
+                                break;
+
+                                case "4":
+                                        region = (!region);
+                                break;
+                        }
+                }
+
+                if(grid) GridInfo     = SetupGrid();
+                if(user) UserInfo     = SetupUser();
+                if(asset) AssetInfo   = SetupAsset();
+                if(region) RegionInfo = SetupRegion();
+        }       
+
+        public static void Main()
+        {
+                if(!File.Exists("opengrid-master-cfg.xml")) 
+                {
+                        Console.WriteLine("Could not find a config file, running initial setup");
+                        InitSetup();
+                }
+                Console.WriteLine("Starting up OGS master service");
+                try {
+                        ServiceBase.Run(new OpenGridMasterService());
+                } catch(Exception e) {
+                        Console.WriteLine("THIS SHOULD NEVER HAPPEN!!!!!!!!!!!!!!!!!!!!!");
+                        Console.WriteLine(e.ToString());
+                }
+        }
+}
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.csproj b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj
new file mode 100644
index 0000000..ac118c3
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj
@@ -0,0 +1,95 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectType>Local</ProjectType>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

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

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

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

+    <ApplicationIcon>

+    </ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>ServiceManager</AssemblyName>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

+    <OutputType>Exe</OutputType>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

+    <RootNamespace>ServiceManager</RootNamespace>

+    <StartupObject>

+    </StartupObject>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+  </PropertyGroup>

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

+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>True</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>False</Optimize>

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

+    <RegisterForComInterop>False</RegisterForComInterop>

+    <RemoveIntegerChecks>False</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <NoWarn>

+    </NoWarn>

+  </PropertyGroup>

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

+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE</DefineConstants>

+    <DocumentationFile>

+    </DocumentationFile>

+    <DebugSymbols>False</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>True</Optimize>

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

+    <RegisterForComInterop>False</RegisterForComInterop>

+    <RemoveIntegerChecks>False</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <NoWarn>

+    </NoWarn>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System">

+      <HintPath>System.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.ServiceProcess">

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.Xml">

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

+      <Private>False</Private>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="ServiceManager.cs">

+      <SubType>Component</SubType>

+    </Compile>

+  </ItemGroup>

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

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>
\ No newline at end of file
diff --git a/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user b/OpenGridServices-Source/ServiceManager/ServiceManager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.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\opensim15-07\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/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build b/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build
new file mode 100644
index 0000000..7397f49
--- /dev/null
+++ b/OpenGridServices-Source/ServiceManager/ServiceManager.exe.build
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>

+<project name="ServiceManager" default="build">

+    <target name="build">

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

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

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

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

+            </fileset>

+        </copy>

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

+            <resources prefix="ServiceManager" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="ServiceManager.cs" />

+            </sources>

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

+                <lib>

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

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

+                </lib>

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

+                <include name="System.ServiceProcess.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/">

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

+                <include name="*.dll"/>

+                <include name="*.exe"/>

+            </fileset>

+        </copy>

+    </target>

+    <target name="clean">

+        <delete dir="${bin.dir}" failonerror="false" />

+        <delete dir="${obj.dir}" failonerror="false" />

+    </target>

+    <target name="doc" description="Creates documentation.">

+    </target>

+</project>

diff --git a/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
index 103b49a..103b49a 100644
--- a/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 5f75821..5f75821 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index fdd6ba4..fdd6ba4 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
index 1aec5aa..1aec5aa 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.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\opensim15-07\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.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index 6bf398e..6bf398e 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
diff --git a/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
index 0fa7d6e..0fa7d6e 100644
--- a/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index b004c10..b004c10 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.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\opensim15-07\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.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index 96272dd..96272dd 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 7432dee..7432dee 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7f911d8..7f911d8 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 0c9c06c..0c9c06c 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index c37acc8..c37acc8 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 6d5b4d0..6d5b4d0 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.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\opensim15-07\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.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 3497a55..3497a55 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
diff --git a/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs
index 57a8913..57a8913 100644
--- a/OpenSim.Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 294e005..294e005 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.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\opensim15-07\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.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 4b5ee51..4b5ee51 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
diff --git a/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs
index a0b6c21..a0b6c21 100644
--- a/OpenSim.Physics/Manager/PhysicsActor.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs
diff --git a/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs
index 291fc7e..291fc7e 100644
--- a/OpenSim.Physics/Manager/PhysicsManager.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs
diff --git a/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs
index 7dab4e1..7dab4e1 100644
--- a/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs
diff --git a/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs
index 3c824d0..3c824d0 100644
--- a/OpenSim.Physics/Manager/PhysicsVector.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs
diff --git a/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
index 913aae7..913aae7 100644
--- a/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs
index 137e44d..599dea8 100644
--- a/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs
@@ -1,456 +1,452 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-using System;
-using System.Collections.Generic;
-using OpenSim.Physics.Manager;
-using Ode.NET;
-
-namespace OpenSim.Physics.OdePlugin
-{
-    /// <summary>
-    /// ODE plugin 
-    /// </summary>
-    public class OdePlugin : IPhysicsPlugin
-    {
-        private OdeScene _mScene;
-
-        public OdePlugin()
-        {
-
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public PhysicsScene GetScene()
-        {
-            if (_mScene == null)
-            {
-                _mScene = new OdeScene();
-            }
-            return (_mScene);
-        }
-
-        public string GetName()
-        {
-            return ("OpenDynamicsEngine");
-        }
-
-        public void Dispose()
-        {
-
-        }
-    }
-
-    public class OdeScene : PhysicsScene
-    {
-        static public IntPtr world;
-        static public IntPtr space;
-        static private IntPtr contactgroup;
-        static private IntPtr LandGeom;
-        //static private IntPtr Land;
-        private double[] _heightmap;
-        static private d.NearCallback nearCallback = near;
-        private List<OdeCharacter> _characters = new List<OdeCharacter>();
-        private static d.ContactGeom[] contacts = new d.ContactGeom[30];
-        private static d.Contact contact;
-
-        public OdeScene()
-        {
-            contact.surface.mode = d.ContactFlags.Bounce | d.ContactFlags.SoftCFM;
-            contact.surface.mu = d.Infinity;
-            contact.surface.mu2 = 0.0f;
-            contact.surface.bounce = 0.1f;
-            contact.surface.bounce_vel = 0.1f;
-            contact.surface.soft_cfm = 0.01f;
-
-            world = d.WorldCreate();
-            space = d.HashSpaceCreate(IntPtr.Zero);
-            contactgroup = d.JointGroupCreate(0);
-            d.WorldSetGravity(world, 0.0f, 0.0f, -0.5f);
-            //d.WorldSetCFM(world, 1e-5f);
-            d.WorldSetAutoDisableFlag(world, false);
-            d.WorldSetContactSurfaceLayer(world, 0.001f);
-           // d.CreatePlane(space, 0, 0, 1, 0);
-            this._heightmap = new double[65536];
-        }
-
-        // This function blatantly ripped off from BoxStack.cs
-        static private void near(IntPtr space, IntPtr g1, IntPtr g2)
-        {
-            //Console.WriteLine("collision callback");
-            IntPtr b1 = d.GeomGetBody(g1);
-            IntPtr b2 = d.GeomGetBody(g2);
-            if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
-                return;
-
-            int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
-            for (int i = 0; i < count; ++i)
-            {
-                contact.geom = contacts[i];
-                IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact);
-                d.JointAttach(joint, b1, b2);
-            }
-
-        }
-
-        public override PhysicsActor AddAvatar(PhysicsVector position)
-        {
-            PhysicsVector pos = new PhysicsVector();
-            pos.X = position.X;
-            pos.Y = position.Y;
-            pos.Z = position.Z + 20;
-            OdeCharacter newAv = new OdeCharacter(this, pos);
-            this._characters.Add(newAv);
-            return newAv;
-        }
-
-        public override void RemoveAvatar(PhysicsActor actor)
-        {
-
-        }
-
-        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-        {
-            PhysicsVector pos = new PhysicsVector();
-            pos.X = position.X;
-            pos.Y = position.Y;
-            pos.Z = position.Z;
-            PhysicsVector siz = new PhysicsVector();
-            siz.X = size.X;
-            siz.Y = size.Y;
-            siz.Z = size.Z;
-            return new OdePrim();
-        }
-
-        public override void Simulate(float timeStep)
-        {
-            foreach (OdeCharacter actor in _characters)
-            {
-                actor.Move(timeStep * 5f);
-            }
-            d.SpaceCollide(space, IntPtr.Zero, nearCallback);
-            d.WorldQuickStep(world, timeStep * 5f);
-            d.JointGroupEmpty(contactgroup);
-            foreach (OdeCharacter actor in _characters)
-            {
-                actor.UpdatePosition();
-            }
-
-        }
-
-        public override void GetResults()
-        {
-
-        }
-
-        public override bool IsThreaded
-        {
-            get
-            {
-                return (false); // for now we won't be multithreaded
-            }
-        }
-
-        public override void SetTerrain(float[] heightMap)
-        {
-            for (int i = 0; i < 65536; i++)
-            {
-                // this._heightmap[i] = (double)heightMap[i];
-                // dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...)
-                int x = i & 0xff;
-                int y = i >> 8;
-                this._heightmap[i] = (double)heightMap[x * 256 + y];
-            }
-            IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
-            d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);
-            d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);
-            LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
-            d.Matrix3 R = new d.Matrix3();
-            
-            Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));
-            Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));
-           //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
-            
-            q1 = q1 * q2;
-            //q1 = q1 * q3;
-            Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();
-            float angle = 0;
-            q1.ToAngleAxis(ref angle, ref v3);
-
-            d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle);
-            d.GeomSetRotation(LandGeom, ref R); 
-            d.GeomSetPosition(LandGeom, 128, 128, 0); 
-        }
-
-        public override void DeleteTerrain()
-        {
-
-        }
-    }
-
-    public class OdeCharacter : PhysicsActor
-    {
-        private PhysicsVector _position;
-        private PhysicsVector _velocity;
-        private PhysicsVector _acceleration;
-        private bool flying;
-        //private float gravityAccel;
-        private IntPtr BoundingCapsule;
-        IntPtr capsule_geom;
-        d.Mass capsule_mass;
-
-        public OdeCharacter(OdeScene parent_scene, PhysicsVector pos)
-        {
-            _velocity = new PhysicsVector();
-            _position = pos;
-            _acceleration = new PhysicsVector();
-            d.MassSetCapsule(out capsule_mass, 5.0f, 3, 0.5f, 2f);
-            capsule_geom = d.CreateCapsule(OdeScene.space, 0.5f, 2f);
-            this.BoundingCapsule = d.BodyCreate(OdeScene.world);
-            d.BodySetMass(BoundingCapsule, ref capsule_mass);
-            d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);
-            d.GeomSetBody(capsule_geom, BoundingCapsule);
-        }
-
-        public override bool Flying
-        {
-            get
-            {
-                return flying;
-            }
-            set
-            {
-                flying = value;
-            }
-        }
-
-        public override PhysicsVector Position
-        {
-            get
-            {
-                return _position;
-            }
-            set
-            {
-                _position = value;
-            }
-        }
-
-        public override PhysicsVector Velocity
-        {
-            get
-            {
-                return _velocity;
-            }
-            set
-            {
-                _velocity = value;
-            }
-        }
-
-        public override bool Kinematic
-        {
-            get
-            {
-                return false;
-            }
-            set
-            {
-
-            }
-        }
-
-        public override Axiom.MathLib.Quaternion Orientation
-        {
-            get
-            {
-                return Axiom.MathLib.Quaternion.Identity;
-            }
-            set
-            {
-
-            }
-        }
-
-        public override PhysicsVector Acceleration
-        {
-            get
-            {
-                return _acceleration;
-            }
-
-        }
-        public void SetAcceleration(PhysicsVector accel)
-        {
-            this._acceleration = accel;
-        }
-
-        public override void AddForce(PhysicsVector force)
-        {
-
-        }
-
-        public override void SetMomentum(PhysicsVector momentum)
-        {
-
-        }
-
-        public void Move(float timeStep)
-        {
-            PhysicsVector vec = new PhysicsVector();
-            vec.X = this._velocity.X * timeStep;
-            vec.Y = this._velocity.Y * timeStep;
-            if (flying)
-            {
-                vec.Z = (this._velocity.Z + 0.5f) * timeStep;
-            }
-            d.BodySetLinearVel(this.BoundingCapsule, vec.X, vec.Y, vec.Z);
-        }
-
-        public void UpdatePosition()
-        {
-            d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);
-            this._position.X = vec.X;
-            this._position.Y = vec.Y;
-            this._position.Z = vec.Z+1.0f;
-        }
-    }
-
-    public class OdePrim : PhysicsActor
-    {
-        private PhysicsVector _position;
-        private PhysicsVector _velocity;
-        private PhysicsVector _acceleration;
-
-        public OdePrim()
-        {
-            _velocity = new PhysicsVector();
-            _position = new PhysicsVector();
-            _acceleration = new PhysicsVector();
-        }
-        public override bool Flying
-        {
-            get
-            {
-                return false; //no flying prims for you
-            }
-            set
-            {
-
-            }
-        }
-        public override PhysicsVector Position
-        {
-            get
-            {
-                PhysicsVector pos = new PhysicsVector();
-                //      PhysicsVector vec = this._prim.Position;
-                //pos.X = vec.X;
-                //pos.Y = vec.Y;
-                //pos.Z = vec.Z;
-                return pos;
-
-            }
-            set
-            {
-                /*PhysicsVector vec = value;
-                PhysicsVector pos = new PhysicsVector();
-                pos.X = vec.X;
-                pos.Y = vec.Y;
-                pos.Z = vec.Z;
-                this._prim.Position = pos;*/
-            }
-        }
-
-        public override PhysicsVector Velocity
-        {
-            get
-            {
-                return _velocity;
-            }
-            set
-            {
-                _velocity = value;
-            }
-        }
-
-        public override bool Kinematic
-        {
-            get
-            {
-                return false;
-                //return this._prim.Kinematic;
-            }
-            set
-            {
-                //this._prim.Kinematic = value;
-            }
-        }
-
-        public override Axiom.MathLib.Quaternion Orientation
-        {
-            get
-            {
-                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
-                return res;
-            }
-            set
-            {
-
-            }
-        }
-
-        public override PhysicsVector Acceleration
-        {
-            get
-            {
-                return _acceleration;
-            }
-
-        }
-        public void SetAcceleration(PhysicsVector accel)
-        {
-            this._acceleration = accel;
-        }
-
-        public override void AddForce(PhysicsVector force)
-        {
-
-        }
-
-        public override void SetMomentum(PhysicsVector momentum)
-        {
-
-        }
-
-
-    }
-
-}
+/*

+* Copyright (c) OpenSim project, http://sim.opensecondlife.org/

+*

+* Redistribution and use in source and binary forms, with or without

+* modification, are permitted provided that the following conditions are met:

+*     * Redistributions of source code must retain the above copyright

+*       notice, this list of conditions and the following disclaimer.

+*     * Redistributions in binary form must reproduce the above copyright

+*       notice, this list of conditions and the following disclaimer in the

+*       documentation and/or other materials provided with the distribution.

+*     * Neither the name of the <organization> nor the

+*       names of its contributors may be used to endorse or promote products

+*       derived from this software without specific prior written permission.

+*

+* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY

+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY

+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+* 

+*/

+using System;

+using System.Collections.Generic;

+using OpenSim.Physics.Manager;

+using Ode.NET;

+

+namespace OpenSim.Physics.OdePlugin

+{

+    /// <summary>

+    /// ODE plugin 

+    /// </summary>

+    public class OdePlugin : IPhysicsPlugin

+    {

+        private OdeScene _mScene;

+

+        public OdePlugin()

+        {

+

+        }

+

+        public bool Init()

+        {

+            return true;

+        }

+

+        public PhysicsScene GetScene()

+        {

+            if (_mScene == null)

+            {

+                _mScene = new OdeScene();

+            }

+            return (_mScene);

+        }

+

+        public string GetName()

+        {

+            return ("OpenDynamicsEngine");

+        }

+

+        public void Dispose()

+        {

+

+        }

+    }

+

+    public class OdeScene : PhysicsScene

+    {

+        static public IntPtr world;

+        static public IntPtr space;

+        static private IntPtr contactgroup;

+        static private IntPtr LandGeom;

+        //static private IntPtr Land;

+        private double[] _heightmap;

+        static private d.NearCallback nearCallback = near;

+        private List<OdeCharacter> _characters = new List<OdeCharacter>();

+        private static d.ContactGeom[] contacts = new d.ContactGeom[30];

+        private static d.Contact contact;

+

+        public OdeScene()

+        {

+            contact.surface.mode = d.ContactFlags.Bounce | d.ContactFlags.SoftCFM;

+            contact.surface.mu = d.Infinity;

+            contact.surface.mu2 = 0.0f;

+            contact.surface.bounce = 0.1f;

+            contact.surface.bounce_vel = 0.1f;

+            contact.surface.soft_cfm = 0.01f;

+

+            world = d.WorldCreate();

+            space = d.HashSpaceCreate(IntPtr.Zero);

+            contactgroup = d.JointGroupCreate(0);

+            d.WorldSetGravity(world, 0.0f, 0.0f, -0.5f);

+            //d.WorldSetCFM(world, 1e-5f);

+            d.WorldSetAutoDisableFlag(world, false);

+            d.WorldSetContactSurfaceLayer(world, 0.001f);

+           // d.CreatePlane(space, 0, 0, 1, 0);

+            this._heightmap = new double[65536];

+        }

+

+        // This function blatantly ripped off from BoxStack.cs

+        static private void near(IntPtr space, IntPtr g1, IntPtr g2)

+        {

+            //Console.WriteLine("collision callback");

+            IntPtr b1 = d.GeomGetBody(g1);

+            IntPtr b2 = d.GeomGetBody(g2);

+            if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))

+                return;

+

+            int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);

+            for (int i = 0; i < count; ++i)

+            {

+                contact.geom = contacts[i];

+                IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact);

+                d.JointAttach(joint, b1, b2);

+            }

+

+        }

+

+        public override PhysicsActor AddAvatar(PhysicsVector position)

+        {

+            PhysicsVector pos = new PhysicsVector();

+            pos.X = position.X;

+            pos.Y = position.Y;

+            pos.Z = position.Z + 20;

+            OdeCharacter newAv = new OdeCharacter(this, pos);

+            this._characters.Add(newAv);

+            return newAv;

+        }

+

+        public override void RemoveAvatar(PhysicsActor actor)

+        {

+

+        }

+

+        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)

+        {

+            PhysicsVector pos = new PhysicsVector();

+            pos.X = position.X;

+            pos.Y = position.Y;

+            pos.Z = position.Z;

+            PhysicsVector siz = new PhysicsVector();

+            siz.X = size.X;

+            siz.Y = size.Y;

+            siz.Z = size.Z;

+            return new OdePrim();

+        }

+

+        public override void Simulate(float timeStep)

+        {

+            foreach (OdeCharacter actor in _characters)

+            {

+                actor.Move(timeStep * 5f);

+            }

+            d.SpaceCollide(space, IntPtr.Zero, nearCallback);

+            d.WorldQuickStep(world, timeStep * 5f);

+            d.JointGroupEmpty(contactgroup);

+            foreach (OdeCharacter actor in _characters)

+            {

+                actor.UpdatePosition();

+            }

+

+        }

+

+        public override void GetResults()

+        {

+

+        }

+

+        public override bool IsThreaded

+        {

+            get

+            {

+                return (false); // for now we won't be multithreaded

+            }

+        }

+

+        public override void SetTerrain(float[] heightMap)

+        {

+            for (int i = 0; i < 65536; i++)

+            {

+                this._heightmap[i] = (double)heightMap[i];

+            }

+            IntPtr HeightmapData = d.GeomHeightfieldDataCreate();

+            d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);

+            d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);

+            LandGeom = d.CreateHeightfield(space, HeightmapData, 1);

+            d.Matrix3 R = new d.Matrix3();

+            

+            Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));

+            Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));

+           //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));

+            

+            q1 = q1 * q2;

+            //q1 = q1 * q3;

+            Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();

+            float angle = 0;

+            q1.ToAngleAxis(ref angle, ref v3);

+

+            d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle);

+            d.GeomSetRotation(LandGeom, ref R); 

+            d.GeomSetPosition(LandGeom, 128, 128, 0); 

+        }

+

+        public override void DeleteTerrain()

+        {

+

+        }

+    }

+

+    public class OdeCharacter : PhysicsActor

+    {

+        private PhysicsVector _position;

+        private PhysicsVector _velocity;

+        private PhysicsVector _acceleration;

+        private bool flying;

+        //private float gravityAccel;

+        private IntPtr BoundingCapsule;

+        IntPtr capsule_geom;

+        d.Mass capsule_mass;

+

+        public OdeCharacter(OdeScene parent_scene, PhysicsVector pos)

+        {

+            _velocity = new PhysicsVector();

+            _position = pos;

+            _acceleration = new PhysicsVector();

+            d.MassSetCapsule(out capsule_mass, 5.0f, 3, 0.5f, 2f);

+            capsule_geom = d.CreateCapsule(OdeScene.space, 0.5f, 2f);

+            this.BoundingCapsule = d.BodyCreate(OdeScene.world);

+            d.BodySetMass(BoundingCapsule, ref capsule_mass);

+            d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);

+            d.GeomSetBody(capsule_geom, BoundingCapsule);

+        }

+

+        public override bool Flying

+        {

+            get

+            {

+                return flying;

+            }

+            set

+            {

+                flying = value;

+            }

+        }

+

+        public override PhysicsVector Position

+        {

+            get

+            {

+                return _position;

+            }

+            set

+            {

+                _position = value;

+            }

+        }

+

+        public override PhysicsVector Velocity

+        {

+            get

+            {

+                return _velocity;

+            }

+            set

+            {

+                _velocity = value;

+            }

+        }

+

+        public override bool Kinematic

+        {

+            get

+            {

+                return false;

+            }

+            set

+            {

+

+            }

+        }

+

+        public override Axiom.MathLib.Quaternion Orientation

+        {

+            get

+            {

+                return Axiom.MathLib.Quaternion.Identity;

+            }

+            set

+            {

+

+            }

+        }

+

+        public override PhysicsVector Acceleration

+        {

+            get

+            {

+                return _acceleration;

+            }

+

+        }

+        public void SetAcceleration(PhysicsVector accel)

+        {

+            this._acceleration = accel;

+        }

+

+        public override void AddForce(PhysicsVector force)

+        {

+

+        }

+

+        public override void SetMomentum(PhysicsVector momentum)

+        {

+

+        }

+

+        public void Move(float timeStep)

+        {

+            PhysicsVector vec = new PhysicsVector();

+            vec.X = this._velocity.X * timeStep;

+            vec.Y = this._velocity.Y * timeStep;

+            if (flying)

+            {

+                vec.Z = (this._velocity.Z + 0.5f) * timeStep;

+            }

+            d.BodySetLinearVel(this.BoundingCapsule, vec.X, vec.Y, vec.Z);

+        }

+

+        public void UpdatePosition()

+        {

+            d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);

+            this._position.X = vec.X;

+            this._position.Y = vec.Y;

+            this._position.Z = vec.Z;

+        }

+    }

+

+    public class OdePrim : PhysicsActor

+    {

+        private PhysicsVector _position;

+        private PhysicsVector _velocity;

+        private PhysicsVector _acceleration;

+

+        public OdePrim()

+        {

+            _velocity = new PhysicsVector();

+            _position = new PhysicsVector();

+            _acceleration = new PhysicsVector();

+        }

+        public override bool Flying

+        {

+            get

+            {

+                return false; //no flying prims for you

+            }

+            set

+            {

+

+            }

+        }

+        public override PhysicsVector Position

+        {

+            get

+            {

+                PhysicsVector pos = new PhysicsVector();

+                //      PhysicsVector vec = this._prim.Position;

+                //pos.X = vec.X;

+                //pos.Y = vec.Y;

+                //pos.Z = vec.Z;

+                return pos;

+

+            }

+            set

+            {

+                /*PhysicsVector vec = value;

+                PhysicsVector pos = new PhysicsVector();

+                pos.X = vec.X;

+                pos.Y = vec.Y;

+                pos.Z = vec.Z;

+                this._prim.Position = pos;*/

+            }

+        }

+

+        public override PhysicsVector Velocity

+        {

+            get

+            {

+                return _velocity;

+            }

+            set

+            {

+                _velocity = value;

+            }

+        }

+

+        public override bool Kinematic

+        {

+            get

+            {

+                return false;

+                //return this._prim.Kinematic;

+            }

+            set

+            {

+                //this._prim.Kinematic = value;

+            }

+        }

+

+        public override Axiom.MathLib.Quaternion Orientation

+        {

+            get

+            {

+                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();

+                return res;

+            }

+            set

+            {

+

+            }

+        }

+

+        public override PhysicsVector Acceleration

+        {

+            get

+            {

+                return _acceleration;

+            }

+

+        }

+        public void SetAcceleration(PhysicsVector accel)

+        {

+            this._acceleration = accel;

+        }

+

+        public override void AddForce(PhysicsVector force)

+        {

+

+        }

+

+        public override void SetMomentum(PhysicsVector momentum)

+        {

+

+        }

+

+

+    }

+

+}

diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
index 68f1aa1..68f1aa1 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.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\opensim15-07\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.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index f25361a..f25361a 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
diff --git a/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
index 913aae7..913aae7 100644
--- a/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index efe9c79..efe9c79 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.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\opensim15-07\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.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 5ab70bb..5ab70bb 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
diff --git a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
index dff1ee2..dff1ee2 100644
--- a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
index dd2b2a9..dd2b2a9 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
index ccebb24..ccebb24 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
index 64a7a32..64a7a32 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 99b86d4..99b86d4 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 6c1c7d2..6c1c7d2 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 0802d75..0802d75 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 2299fa4..2299fa4 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
diff --git a/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
index 5229dbd..a3b191c 100644
--- a/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
@@ -35,45 +35,38 @@ namespace OpenSim
 

                 foreach (Hashtable neighbour in gridServer.neighbours)

                 {

-                    try

-                    {

-                        string neighbourIPStr = (string)neighbour["sim_ip"];

-                        System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);

-                        ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);

-                        string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();

-

-                        Console.WriteLine(reqUrl);

-

-                        SimParams = new Hashtable();

-                        SimParams["session_id"] = this.SessionID.ToString();

-                        SimParams["secure_session_id"] = this.SecureSessionID.ToString();

-                        SimParams["firstname"] = this.ClientAvatar.firstname;

-                        SimParams["lastname"] = this.ClientAvatar.lastname;

-                        SimParams["agent_id"] = this.AgentID.ToString();

-                        SimParams["circuit_code"] = (Int32)this.CircuitCode;

-                        SimParams["child_agent"] = "1";

-                        SendParams = new ArrayList();

-                        SendParams.Add(SimParams);

-

-                        GridReq = new XmlRpcRequest("expect_user", SendParams);

-                        GridResp = GridReq.Send(reqUrl, 3000);

-                        EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();

-                        enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();

-                        enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));

-

-

-                        byte[] byteIP = neighbourIP.GetAddressBytes();

-                        enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;

-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;

-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;

-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];

-                        enablesimpacket.SimulatorInfo.Port = neighbourPort;

-                        enablePackets.Add(enablesimpacket);

-                    }

-                    catch (Exception e)

-                    {

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");

-                    }

+                    string neighbourIPStr = (string)neighbour["sim_ip"];

+                    System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);

+                    ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);

+                    string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();

+

+                    Console.WriteLine(reqUrl);

+

+                    SimParams = new Hashtable();

+                    SimParams["session_id"] = this.SessionID.ToString();

+                    SimParams["secure_session_id"] = this.SecureSessionID.ToString();

+                    SimParams["firstname"] = this.ClientAvatar.firstname;

+                    SimParams["lastname"] = this.ClientAvatar.lastname;

+                    SimParams["agent_id"] = this.AgentID.ToString();

+                    SimParams["circuit_code"] = (Int32)this.CircuitCode;

+                    SimParams["child_agent"] = "1";

+                    SendParams = new ArrayList();

+                    SendParams.Add(SimParams);

+

+                    GridReq = new XmlRpcRequest("expect_user", SendParams);

+                    GridResp = GridReq.Send(reqUrl, 3000);

+                    EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();

+                    enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();

+                    enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));

+

+

+                    byte[] byteIP = neighbourIP.GetAddressBytes();

+                    enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;

+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;

+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;

+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];

+                    enablesimpacket.SimulatorInfo.Port = neighbourPort;

+                    enablePackets.Add(enablesimpacket);

                 }

                 Thread.Sleep(3000);

                 foreach (Packet enable in enablePackets)

diff --git a/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 070c200..75fcf18 100644
--- a/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -98,39 +98,18 @@ namespace OpenSim
                 if (multipleupdate.ObjectData[i].Type == 9) //change position

                 {

                     libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);

-                    foreach (Entity ent in m_world.Entities.Values)

-                    {

-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)

-                        {

-                            ((OpenSim.world.Primitive)ent).UpdatePosition(pos);

-

-                        }

-                    }

+                    OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);

                     //should update stored position of the prim

                 }

                 else if (multipleupdate.ObjectData[i].Type == 10)//rotation

                 {

                     libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);

-                    foreach (Entity ent in m_world.Entities.Values)

-                    {

-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)

-                        {

-                            ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);

-                            ((OpenSim.world.Primitive)ent).UpdateFlag = true;

-                        }

-                    }

+                    OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);

                 }

                 else if (multipleupdate.ObjectData[i].Type == 13)//scale

                 {

-

                     libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);

-                    foreach (Entity ent in m_world.Entities.Values)

-                    {

-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)

-                        {

-                            ((OpenSim.world.Primitive)ent).Scale = scale;

-                        }

-                    }

+                    OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);            

                 }

             }

             return true;

diff --git a/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index a78f27a..a6ad8d2 100644
--- a/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -20,17 +20,20 @@ namespace OpenSim
 {

     public partial class ClientView

     {

-        public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

-        public delegate void RezObject(AssetBase primasset, LLVector3 pos);

-        public delegate void ModifyTerrain(byte Action, float North, float West);

-        public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);

-        public delegate void StartAnim(LLUUID animID, int seq);

-        public delegate void GenericCall(ClientView RemoteClient);

+        public delegate void GenericCall(ClientView remoteClient);

         public delegate void GenericCall2();

         public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.

+        public delegate void GenericCall4(Packet packet, ClientView remoteClient);

+        public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);

+        public delegate void ObjectSelect(uint localID, ClientView remoteClient);

+        public delegate void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient);

+        public delegate void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient);

+        public delegate void UpdatePrimVector(uint localID, LLVector3 pos, ClientView remoteClient);

+        public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient);

 

         public event ChatFromViewer OnChatFromViewer;

         public event RezObject OnRezObject;

+        public event GenericCall4 OnDeRezObject;

         public event ModifyTerrain OnModifyTerrain;

         public event GenericCall OnRegionHandShakeReply;

         public event GenericCall OnRequestWearables;

@@ -39,6 +42,15 @@ namespace OpenSim
         public event GenericCall3 OnAgentUpdate;

         public event StartAnim OnStartAnim;

         public event GenericCall OnRequestAvatarsData;

+        public event LinkObjects OnLinkObjects;

+        public event GenericCall4 OnAddPrim;

+        public event UpdateShape OnUpdatePrimShape;

+        public event ObjectSelect OnObjectSelect;

+        public event UpdatePrimFlags OnUpdatePrimFlags;

+        public event UpdatePrimTexture OnUpdatePrimTexture;

+        public event UpdatePrimVector OnUpdatePrimPosition;

+        public event UpdatePrimRotation OnUpdatePrimRotation;

+        public event UpdatePrimVector OnUpdatePrimScale;

 

         protected override void ProcessInPacket(Packet Pack)

         {

@@ -62,7 +74,20 @@ namespace OpenSim
 

                 switch (Pack.Type)

                 {

-                    #region New Event system

+                    case PacketType.ViewerEffect:

+                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;

+                        foreach (ClientView client in m_clientThreads.Values)

+                        {

+                            if (client.AgentID != this.AgentID)

+                            {

+                                viewer.AgentData.AgentID = client.AgentID;

+                                viewer.AgentData.SessionID = client.SessionID;

+                                client.OutPacket(viewer);

+                            }

+                        }

+                        break;

+

+                    #region New Event System - World/Avatar

                     case PacketType.ChatFromViewer:

                         ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;

                         if (Util.FieldToString(inchatpack.ChatData.Message) == "")

@@ -93,153 +118,100 @@ namespace OpenSim
                             }

                         }

                         break;

+                    case PacketType.DeRezObject:

+                        OnDeRezObject(Pack, this);

+                        break;

                     case PacketType.ModifyLand:

-                         ModifyLandPacket modify = (ModifyLandPacket)Pack;

-                         if (modify.ParcelData.Length > 0)

-                         {

-                             OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);

-                         }

-                         break;

+                        ModifyLandPacket modify = (ModifyLandPacket)Pack;

+                        if (modify.ParcelData.Length > 0)

+                        {

+                            OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);

+                        }

+                        break;

+                    case PacketType.RegionHandshakeReply:

+                        OnRegionHandShakeReply(this);

+                        break;

+                    case PacketType.AgentWearablesRequest:

+                        OnRequestWearables(this);

+                        OnRequestAvatarsData(this);

+                        break;

+                    case PacketType.AgentSetAppearance:

+                        AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;

+                        OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);

+                        break;

+                    case PacketType.CompleteAgentMovement:

+                        if (this.m_child) this.UpgradeClient();

+                        OnCompleteMovementToRegion();

+                        this.EnableNeighbours();

+                        break;

+                    case PacketType.AgentUpdate:

+                        OnAgentUpdate(Pack);

+                        break;

+                    case PacketType.AgentAnimation:

+                        if (!m_child)

+                        {

+                            AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;

+                            for (int i = 0; i < AgentAni.AnimationList.Length; i++)

+                            {

+                                if (AgentAni.AnimationList[i].StartAnim)

+                                {

+                                    OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);

+                                }

+                            }

+                        }

+                        break;

 

-                     case PacketType.RegionHandshakeReply:

-                         OnRegionHandShakeReply(this);

-                         break;

-                     case PacketType.AgentWearablesRequest:

-                         OnRequestWearables(this);

-                         OnRequestAvatarsData(this);

-                         break;

-                     case PacketType.AgentSetAppearance:

-                         AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;

-                         OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);

-                         break;

-                     case PacketType.CompleteAgentMovement:

-                         if (this.m_child) this.UpgradeClient();

-                         OnCompleteMovementToRegion();

-                         this.EnableNeighbours();

-                         break;

-                     case PacketType.AgentUpdate:

-                         OnAgentUpdate(Pack);

-                         break;

-                     case PacketType.AgentAnimation:

-                         if (!m_child)

-                         {

-                             AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;

-                             for (int i = 0; i < AgentAni.AnimationList.Length; i++)

-                             {

-                                 if (AgentAni.AnimationList[i].StartAnim)

-                                 {

-                                     OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);

-                                 }

-                             }

-                         }

-                         break;

-                     case PacketType.AgentIsNowWearing:

-                         // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;

-                         //Console.WriteLine(Pack.ToString());

-                         break;

                     #endregion

 

-                        //old handling, should move most to a event based system.

-                    #region World/Avatar/Primitive related packets

-                    case PacketType.ObjectAdd:

-                        m_world.AddNewPrim((ObjectAddPacket)Pack, this);

-                        break;

+                    #region New Event System - Objects/Prims

                     case PacketType.ObjectLink:

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

+                        // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

                         ObjectLinkPacket link = (ObjectLinkPacket)Pack;

                         uint parentprimid = 0;

-                        OpenSim.world.Primitive parentprim = null;

+                        List<uint> childrenprims = new List<uint>();

                         if (link.ObjectData.Length > 1)

                         {

                             parentprimid = link.ObjectData[0].ObjectLocalID;

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == parentprimid)

-                                {

-                                    parentprim = (OpenSim.world.Primitive)ent;

 

-                                }

-                            }

                             for (int i = 1; i < link.ObjectData.Length; i++)

                             {

-                                foreach (Entity ent in m_world.Entities.Values)

-                                {

-                                    if (ent.localid == link.ObjectData[i].ObjectLocalID)

-                                    {

-                                        ((OpenSim.world.Primitive)ent).MakeParent(parentprim);

-                                    }

-                                }

+                                childrenprims.Add(link.ObjectData[i].ObjectLocalID);

                             }

                         }

+                        OnLinkObjects(parentprimid, childrenprims);

                         break;

-                    case PacketType.ObjectScale:

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

+                    case PacketType.ObjectAdd:

+                        m_world.AddNewPrim((ObjectAddPacket)Pack, this);

+                        OnAddPrim(Pack, this);

                         break;

                     case PacketType.ObjectShape:

                         ObjectShapePacket shape = (ObjectShapePacket)Pack;

                         for (int i = 0; i < shape.ObjectData.Length; i++)

                         {

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == shape.ObjectData[i].ObjectLocalID)

-                                {

-                                    ((OpenSim.world.Primitive)ent).UpdateShape(shape.ObjectData[i]);

-                                }

-                            }

+                            OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);

                         }

                         break;

                     case PacketType.ObjectSelect:

                         ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;

                         for (int i = 0; i < incomingselect.ObjectData.Length; i++)

                         {

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == incomingselect.ObjectData[i].ObjectLocalID)

-                                {

-                                    ((OpenSim.world.Primitive)ent).GetProperites(this);

-                                    break;

-                                }

-                            }

+                            OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);

                         }

                         break;

+                    case PacketType.ObjectFlagUpdate:

+                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;

+                        OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);

+                        break;

                     case PacketType.ObjectImage:

                         ObjectImagePacket imagePack = (ObjectImagePacket)Pack;

                         for (int i = 0; i < imagePack.ObjectData.Length; i++)

                         {

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == imagePack.ObjectData[i].ObjectLocalID)

-                                {

-                                    ((OpenSim.world.Primitive)ent).UpdateTexture(imagePack.ObjectData[i].TextureEntry);

-                                }

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectFlagUpdate:

-                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;

-                        foreach (Entity ent in m_world.Entities.Values)

-                        {

-                            if (ent.localid == flags.AgentData.ObjectLocalID)

-                            {

-                                ((OpenSim.world.Primitive)ent).UpdateObjectFlags(flags);

-                            }

+                            OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);

+

                         }

                         break;

+                    #endregion      

                    

-                    case PacketType.ViewerEffect:

-                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;

-                        foreach (ClientView client in m_clientThreads.Values)

-                        {

-                            if (client.AgentID != this.AgentID)

-                            {

-                                viewer.AgentData.AgentID = client.AgentID;

-                                viewer.AgentData.SessionID = client.SessionID;

-                                client.OutPacket(viewer);

-                            }

-                        }

-                        break;

-                    #endregion

-

                     #region Inventory/Asset/Other related packets

                     case PacketType.RequestImage:

                         RequestImagePacket imageRequest = (RequestImagePacket)Pack;

@@ -464,6 +436,16 @@ namespace OpenSim
                         }

                         break;

                     #endregion

+

+                    #region unimplemented handlers

+                    case PacketType.AgentIsNowWearing:

+                        // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;

+                        //Console.WriteLine(Pack.ToString());

+                        break;

+                    case PacketType.ObjectScale:

+                        //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

+                        break;

+                    #endregion

                 }

             }

         }

diff --git a/OpenSim.RegionServer/ClientView.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
index ccea2f3..e66b830 100644
--- a/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
@@ -50,7 +50,7 @@ namespace OpenSim
     /// Handles new client connections

     /// Constructor takes a single Packet and authenticates everything

     /// </summary>

-    public partial class ClientView : ClientViewBase

+    public partial class ClientView : ClientViewBase, IClientAPI

     {

         protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients

         protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance 

@@ -138,7 +138,6 @@ namespace OpenSim
             {

                 this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);

                 m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);

-                //Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);

             }

             this.InitNewClient();

         }

diff --git a/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
index 814b025..572dbce 100644
--- a/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
@@ -9,11 +9,11 @@ using System.IO;
 using System.Threading;

 using System.Timers;

 using OpenSim.Framework.Utilities;

-

+using OpenSim.Framework.Interfaces;

 

 namespace OpenSim

 {

-    public class ClientViewBase

+    public class ClientViewBase 

     {

         protected BlockingQueue<QueItem> PacketQueue;

         protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();

diff --git a/OpenSim.RegionServer/Grid.cs b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
index db5b8fe..db5b8fe 100644
--- a/OpenSim.RegionServer/Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 512ee88..512ee88 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.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\opensim15-07\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.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 4ec3537..4ec3537 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
index 003412d..003412d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
diff --git a/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
index 15ee740..15ee740 100644
--- a/OpenSim.RegionServer/OpenSimNetworkHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
diff --git a/OpenSim.RegionServer/PacketServer.cs b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
index 4ebe023..fb35723 100644
--- a/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim
         {

             if (this._localWorld != null)

             {

-                ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);

+                //ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);

                 ClientView.AddPacketHandler(PacketType.UUIDNameRequest, this.RequestUUIDName);

             }

         }

diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
index f82495a..f82495a 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
diff --git a/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
index 42d3030..42d3030 100644
--- a/OpenSim.RegionServer/RegionInfoBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
diff --git a/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
index 69a8748..69a8748 100644
--- a/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
diff --git a/OpenSim.RegionServer/UDPServer.cs b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
index 3a93e66..3a93e66 100644
--- a/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
diff --git a/OpenSim.RegionServer/VersionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
index 49cc6a5..49cc6a5 100644
--- a/OpenSim.RegionServer/VersionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
diff --git a/OpenSim.RegionServer/types/Mesh.cs b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
index 3e00c91..3e00c91 100644
--- a/OpenSim.RegionServer/types/Mesh.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
diff --git a/OpenSim.RegionServer/types/Triangle.cs b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
index 8dfea6e..8dfea6e 100644
--- a/OpenSim.RegionServer/types/Triangle.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
index 7656a89..7656a89 100644
--- a/OpenSim.RegionServer/world/Avatar.Client.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
index 266fc38..e49fab3 100644
--- a/OpenSim.RegionServer/world/Avatar.Update.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
@@ -93,10 +93,10 @@ namespace OpenSim.world
             }

 

         }

-        public void SendUpdateToOtherClient(Avatar RemoteAvatar)

+        public void SendUpdateToOtherClient(Avatar remoteAvatar)

         {

             ObjectUpdatePacket objupdate = CreateUpdatePacket();

-            RemoteAvatar.SendPacketToViewer(objupdate);

+            remoteAvatar.SendPacketToViewer(objupdate);

         }

 

         public ObjectUpdatePacket CreateUpdatePacket()

diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
index 4e90364..680d059 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
@@ -6,6 +6,7 @@ using libsecondlife;
 using libsecondlife.Packets;

 using OpenSim.Physics.Manager;

 using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Interfaces;

 using Axiom.MathLib;

 

 namespace OpenSim.world

@@ -66,11 +67,11 @@ namespace OpenSim.world
 

             //register for events

             ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);

-            ControllingClient.OnSetAppearance += new ClientView.SetAppearance(this.SetAppearance);

+            ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);

             ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);

             ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);

             ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);

-            ControllingClient.OnStartAnim += new ClientView.StartAnim(this.SendAnimPack);

+            ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);

 

         }

 

@@ -349,7 +350,7 @@ namespace OpenSim.world
         }

 

         //really really should be moved somewhere else (RegionInfo.cs ?)

-        public void SendRegionHandshake(World RegionInfo)

+        public void SendRegionHandshake(World regionInfo)

         {

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");

             System.Text.Encoding _enc = System.Text.Encoding.ASCII;

diff --git a/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
index b554af8..b554af8 100644
--- a/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
index 96e039a..96e039a 100644
--- a/OpenSim.RegionServer/world/Entity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
index e048a9e..e048a9e 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
index 6d071d4..6d071d4 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
index a846fb5..a846fb5 100644
--- a/OpenSim.RegionServer/world/SceneObject.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
diff --git a/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
index 7d74cb7..348cd30 100644
--- a/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -15,31 +15,31 @@ namespace OpenSim.world
 {

     public partial class World

     {

-        public void ModifyTerrain(byte Action, float North, float West)

+        public void ModifyTerrain(byte action, float north, float west)

         {

-            switch (Action)

+            switch (action)

             {

                 case 1:

                     // raise terrain

-                    Terrain.raise(North, West, 10.0, 0.001);

-                    RegenerateTerrain(true, (int)North, (int)West);

+                    Terrain.raise(north, west, 10.0, 0.1);

+                    RegenerateTerrain(true, (int)north, (int)west);

                     break;

                 case 2:

                     //lower terrain

-                    Terrain.lower(North, West, 10.0, 0.001);

-                    RegenerateTerrain(true, (int)North, (int)West);

+                    Terrain.lower(north, west, 10.0, 0.1);

+                    RegenerateTerrain(true, (int)north, (int)west);

                     break;

             }

             return;

         }

 

         public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

-        {  

+        {

             foreach (ClientView client in m_clientThreads.Values)

             {

                 // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));

                 int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);

-                

+

                 switch (type)

                 {

                     case 0: // Whisper

@@ -61,7 +61,7 @@ namespace OpenSim.world
                             client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         }

                         break;

-                        

+

                     case 0xff: // Broadcast

                         client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         break;

@@ -70,16 +70,16 @@ namespace OpenSim.world
             }

         }

 

-        public void RezObject(AssetBase primasset, LLVector3 pos)

+        public void RezObject(AssetBase primAsset, LLVector3 pos)

         {

-            PrimData primd = new PrimData(primasset.Data);

+            PrimData primd = new PrimData(primAsset.Data);

             Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);

             nPrim.CreateFromStorage(primd, pos, this._primCount, true);

             this.Entities.Add(nPrim.uuid, nPrim);

             this._primCount++;

         }

 

-        public bool DeRezObject(ClientView simClient, Packet packet)

+        public void DeRezObject(Packet packet, ClientView simClient)

         {

             DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;

 

@@ -165,19 +165,130 @@ namespace OpenSim.world
                     }

                 }

             }

-            return true;

+            

         }

 

-        public void SendAvatarsToClient(ClientView RemoteClient)

+        public void SendAvatarsToClient(ClientView remoteClient)

         {

             foreach (ClientView client in m_clientThreads.Values)

             {

-                if (client.AgentID != RemoteClient.AgentID)

+                if (client.AgentID != remoteClient.AgentID)

+                {

+                    // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();

+                    // RemoteClient.OutPacket(objupdate);

+                    client.ClientAvatar.SendUpdateToOtherClient(remoteClient.ClientAvatar);

+                    client.ClientAvatar.SendAppearanceToOtherAgent(remoteClient.ClientAvatar);

+                }

+            }

+        }

+

+        public void LinkObjects(uint parentPrim, List<uint> childPrims)

+        {

+            Primitive parentprim = null;

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == parentPrim)

+                {

+                    parentprim = (OpenSim.world.Primitive)ent;

+

+                }

+            }

+

+            for (int i = 0; i < childPrims.Count; i++)

+            {

+                uint childId = childPrims[i];

+                foreach (Entity ent in Entities.Values)

+                {

+                    if (ent.localid == childId)

+                    {

+                        ((OpenSim.world.Primitive)ent).MakeParent(parentprim);

+                    }

+                }

+            }

+

+        }

+

+        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == primLocalID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdateShape(shapeBlock);

+                    break;

+                }

+            }

+        }

+

+        public void SelectPrim(uint primLocalID, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == primLocalID)

+                {

+                    ((OpenSim.world.Primitive)ent).GetProperites(remoteClient);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdateObjectFlags((ObjectFlagUpdatePacket) packet);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdateTexture(texture);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimPosition(uint localID, LLVector3 pos, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdatePosition(pos);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

                 {

-                   // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();

-                   // RemoteClient.OutPacket(objupdate);

-                    client.ClientAvatar.SendUpdateToOtherClient(RemoteClient.ClientAvatar);

-                    client.ClientAvatar.SendAppearanceToOtherAgent(RemoteClient.ClientAvatar);

+                    ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);

+                    ((OpenSim.world.Primitive)ent).UpdateFlag = true;

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimScale(uint localID, LLVector3 scale, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).Scale = scale;

+                    break;

                 }

             }

         }

diff --git a/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
index 44ef05a..44ef05a 100644
--- a/OpenSim.RegionServer/world/World.Scripting.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
index 99fb8e0..921da3c 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
@@ -495,9 +495,9 @@ namespace OpenSim.world
             }

         }

 

-        public void AddNewPrim(ObjectAddPacket addPacket, ClientView AgentClient)

+        public void AddNewPrim(Packet addPacket, ClientView agentClient)

         {

-            AddNewPrim(addPacket, AgentClient.AgentID);

+            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentID);

         }

 

         public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)

@@ -533,12 +533,22 @@ namespace OpenSim.world
         public override void AddViewerAgent(ClientView agentClient)

         {

             //register for events

-            agentClient.OnChatFromViewer += new ClientView.ChatFromViewer(this.SimChat);

-            agentClient.OnRezObject += new ClientView.RezObject(this.RezObject);

-            agentClient.OnModifyTerrain += new ClientView.ModifyTerrain(this.ModifyTerrain);

+            agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);

+            agentClient.OnRezObject += new RezObject(this.RezObject);

+            agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain);

             agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);

             agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);

             agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);

+            agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);

+            agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);

+            agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);

+            agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);

+            agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);

+            agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);

+            agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition);

+            agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);

+            agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);

+            agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);

 

             try

             {

diff --git a/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
index edc5518..edc5518 100644
--- a/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
index 465c23b..465c23b 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
index 2ef16a4..2ef16a4 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
index 15efc49..15efc49 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
diff --git a/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
index 48c18ff..48c18ff 100644
--- a/OpenSim.RegionServer/world/scripting/Script.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
diff --git a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
index 4c6d373..4c6d373 100644
--- a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
diff --git a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
index 6a689ab..6a689ab 100644
--- a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
index 15ef814..15ef814 100644
--- a/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
index f2f0da5..f2f0da5 100644
--- a/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Heap.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs
index 138e85e..138e85e 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Heap.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
index b94248c..b94248c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
index 3b7da35..3b7da35 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index c66c148..c66c148 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
index 6704e31..6704e31 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
index ff18f90..ff18f90 100644
--- a/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
index 2541991..2541991 100644
--- a/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Object.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs
index e6e392c..e6e392c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Object.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index a1e95f4..a1e95f4 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.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\opensim15-07\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.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ae79c83..ae79c83 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
index b47bb50..b47bb50 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
index 53a0f08..53a0f08 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Stack.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs
index d77d82e..d77d82e 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Stack.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
index afca7a9..afca7a9 100644
--- a/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Thread.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs
index 436949c..436949c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Thread.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
index 2854eab..2854eab 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
index 270aa7b..270aa7b 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
index da28eaa..da28eaa 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
index 1a3ecff..1a3ecff 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
index 19002d4..19002d4 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
index 91f1679..91f1679 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
index 4ecd325..4ecd325 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index d4db8c0..d4db8c0 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
index 12c5016..12c5016 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/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\opensim15-07\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-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index 885b088..885b088 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
diff --git a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
index 6610606..6610606 100644
--- a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 5dceb7f..5dceb7f 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
index db590ff..db590ff 100644
--- a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 6504b77..6504b77 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.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\opensim15-07\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/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 8be321d..8be321d 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
diff --git a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
index ba9e139..ba9e139 100644
--- a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
diff --git a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
index 8039721..8039721 100644
--- a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/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\opensim15-07\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-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index 79c27fc..79c27fc 100644
--- a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
diff --git a/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index fe81f8a..fe81f8a 100644
--- a/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 368405b..368405b 100644
--- a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index 5a73897..1cdfaf6 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
@@ -66,10 +66,6 @@
       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Drawing" >

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

-      <Private>False</Private>

-    </Reference>

     <Reference Include="System.Data" >

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

       <Private>False</Private>

diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.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\opensim15-07\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.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index 86c6a5c..e1a3d2d 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -19,11 +19,10 @@
                     <include name="${project::get-base-directory()}" />

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

                 </lib>

-                <include name="../bin/libTerrain-BSD.dll" />

                 <include name="System.dll" />

-                <include name="System.Drawing.dll" />

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

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

+                <include name="../bin/libTerrain-BSD.dll" />

             </references>

         </csc>

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

diff --git a/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index bd74993..bd74993 100644
--- a/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
index a0f37f9..a0f37f9 100644
--- a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
diff --git a/OpenSim/Application.cs b/OpenSim-Source/OpenSim/Application.cs
index 3f9c0ec..3f9c0ec 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim-Source/OpenSim/Application.cs
diff --git a/OpenSim/OpenSim.csproj b/OpenSim-Source/OpenSim/OpenSim.csproj
index 4456fc7..4456fc7 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim-Source/OpenSim/OpenSim.csproj
diff --git a/OpenSim-Source/OpenSim/OpenSim.csproj.user b/OpenSim-Source/OpenSim/OpenSim.csproj.user
new file mode 100644
index 0000000..1422ebf
--- /dev/null
+++ b/OpenSim-Source/OpenSim/OpenSim.csproj.user
@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <StartArguments>-loginserver -sandbox -accounts</StartArguments>

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\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/OpenSim.exe.build b/OpenSim-Source/OpenSim/OpenSim.exe.build
index 19d0b28..19d0b28 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim-Source/OpenSim/OpenSim.exe.build
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim-Source/OpenSim/OpenSimMain.cs
index 9025316..9025316 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim-Source/OpenSim/OpenSimMain.cs
diff --git a/ServiceManager/ServiceManager.csproj b/ServiceManager/ServiceManager.csproj
index f703ef1..ac118c3 100644
--- a/ServiceManager/ServiceManager.csproj
+++ b/ServiceManager/ServiceManager.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>ServiceManager</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>ServiceManager</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,18 +61,19 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.ServiceProcess" >

+    <Reference Include="System.ServiceProcess">

       <HintPath>System.ServiceProcess.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

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

       <Private>False</Private>

     </Reference>

@@ -75,7 +82,7 @@
   </ItemGroup>

   <ItemGroup>

     <Compile Include="ServiceManager.cs">

-      <SubType>Code</SubType>

+      <SubType>Component</SubType>

     </Compile>

   </ItemGroup>

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

@@ -85,4 +92,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/bin/Shortcut to OpenSim.exe.lnk b/bin/Shortcut to OpenSim.exe.lnk
new file mode 100644
index 0000000..fcb40c7
--- /dev/null
+++ b/bin/Shortcut to OpenSim.exe.lnk
diff --git a/prebuild.xml b/prebuild.xml
index e3de61d..e049bd7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -247,155 +247,148 @@
         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

+    

 

-

-    <!-- OpenGrid Data Services -->

-    <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library">

+    <Project name="OpenSim.Physics.Manager" path="OpenSim.Physics/Manager" 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"/>

-      <Reference name="libsecondlife.dll"/>

+      <Reference name="System.Xml" localCopy="false" />

+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

+      <Reference name="OpenSim.Framework" localCopy="false"/>

+      <Reference name="OpenSim.Framework.Console" localCopy="false"/>

       <Files>

-        <Match pattern="*.cs" recurse="true"/>

+        <Match pattern="*.cs" recurse="false"/>

       </Files>

     </Project>

 

-    <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" type="Library">

+

+    <!-- Physics Plug-ins -->

+    <Project name="OpenSim.Physics.BasicPhysicsPlugin" path="OpenSim.Physics/BasicPhysicsPlugin" type="Library">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

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

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

-      <Reference name="System.Xml"/>

-      <Reference name="System.Data"/>

-      <Reference name="OpenGrid.Framework.Data"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="MySql.Data.dll"/>

+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

+      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGrid.Framework.Data.DB4o" type="Library">

+    <Project name="OpenSim.Physics.PhysXPlugin" path="OpenSim.Physics/PhysXPlugin" type="Library">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

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

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

-      <Reference name="System.Xml"/>

-      <Reference name="System.Data"/>

-      <Reference name="OpenGrid.Framework.Data"/>

-      <Reference name="libsecondlife.dll"/>

-      <Reference name="Db4objects.Db4o.dll"/>

+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

+      <Reference name="PhysX_Wrapper_Dotnet.dll" localCopy="false"/>

+      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGrid.Framework.Data.MSSQL" type="Library">

+    <Project name="OpenSim.Physics.OdePlugin" path="OpenSim.Physics/OdePlugin" type="Library">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

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

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

-      <Reference name="System.Xml"/>

-      <Reference name="System.Data"/>

-      <Reference name="OpenGrid.Framework.Data"/>

-      <Reference name="libsecondlife.dll"/>

+      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

+      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>

+      <Reference name="Ode.NET.dll" localCopy="false" />      

+

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGrid.Framework.Data.SQLite" type="Library">

+     <!-- Xml Config Dll -->

+     <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" 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>

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

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

+      <Reference name="System"/>

       <Reference name="System.Xml"/>

-      <Reference name="System.Data"/>

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

-      <Reference name="OpenGrid.Framework.Data"/>

-      <Reference name="libsecondlife.dll"/>

+     <Reference name="OpenSim.Framework"/>

+

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <!-- OGS projects -->    

-   

-   <Project name="OpenGrid.Framework.Manager" path="OpenGrid.Framework.Manager" type="Library">

+        <!-- Basic embedded JVM -->

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

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

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

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

+      <Reference name="System"/>

+      <Reference name="System.Xml"/>

      <Reference name="OpenSim.Framework"/>

-     <Reference name="OpenSim.Servers"/>

-     <Reference name="libsecondlife.dll"/>

-     <Reference name="XMLRPC"/>

-

 

-     <Files>

-       <Match pattern="*.cs" recurse="true"/>

-     </Files>

+      <Files>

+        <Match pattern="*.cs" recurse="true"/>

+      </Files>

     </Project>

 

 

-   <Project name="ServiceManager" path="ServiceManager" type="Exe">

+     <!-- Terrain engine -->

+     <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim.Terrain.BasicTerrain" type="Library">

       <Configuration name="Debug">

         <Options>

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

@@ -407,18 +400,19 @@
         </Options>

       </Configuration>

 

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

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

-     <Reference name="System.ServiceProcess" localCopy="false"/>

-     <Reference name="System.Xml" localCopy="false"/>

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

+      <Reference name="System"/>

+      <Reference name="System.Drawing"/>

+      <Reference name="System.Data"/>

+      <Reference name="System.Xml"/>

+        <Reference name="libTerrain-BSD.dll"/>

 

-     <Files>

-       <Match pattern="*.cs" recurse="true"/>

-     </Files>

+      <Files>

+        <Match pattern="*.cs" recurse="true"/>

+      </Files>

     </Project>

 

- 

-    <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe">

+    <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Library">

       <Configuration name="Debug">

         <Options>

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

@@ -430,25 +424,27 @@
         </Options>

       </Configuration>

 

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

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

-     <Reference name="System.Data" localCopy="false"/>

-     <Reference name="System.Xml" localCopy="false"/>

-     <Reference name="OpenSim.Framework"/>

-     <Reference name="OpenSim.Framework.Console"/>

-     <Reference name="OpenSim.Servers"/>

-     <Reference name="OpenGrid.Framework.Data"/>

-     <Reference name="OpenGrid.Framework.Manager"/>

-     <Reference name="libsecondlife.dll"/>

-     <Reference name="Db4objects.Db4o.dll"/>

-     <Reference name="XMLRPC"/>

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

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

+      <Reference name="System.Xml"/>

+      <Reference name="libsecondlife.dll"/>

+      <Reference name="Axiom.MathLib.dll"/>

+      <Reference name="Db4objects.Db4o.dll"/>

+      <Reference name="OpenSim.Terrain.BasicTerrain"/>

+      <Reference name="OpenSim.Framework"/>

+      <Reference name="OpenSim.Framework.Console"/>

+      <Reference name="OpenSim.GenericConfig.Xml"/>

+      <Reference name="OpenSim.Physics.Manager"/>

+      <Reference name="OpenSim.Servers"/>

+      <Reference name="XMLRPC"/>

 

-     <Files>

-       <Match pattern="*.cs" recurse="true"/>

-     </Files>

+      <Files>

+        <Match pattern="*.cs" recurse="true"/>

+      </Files>

     </Project>

 

- <Project name="OpenGridServices.AssetServer" path="OpenGridServices.AssetServer" type="Exe">

+    <!-- OpenSim app -->

+    <Project name="OpenSim" path="OpenSim" type="Exe">

       <Configuration name="Debug">

         <Options>

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

@@ -460,24 +456,64 @@
         </Options>

       </Configuration>

 

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

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

-     <Reference name="System.Data" localCopy="false"/>

-     <Reference name="System.Xml" localCopy="false"/>

-     <Reference name="OpenSim.Framework"/>

-     <Reference name="OpenSim.Framework.Console"/>

-     <Reference name="OpenSim.GridInterfaces.Local"/>

-     <Reference name="OpenSim.Servers"/>

-     <Reference name="libsecondlife.dll"/>

-     <Reference name="Db4objects.Db4o.dll"/>

-     <Reference name="XMLRPC"/>

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

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

+      <Reference name="System.Xml"/>

+      <Reference name="libsecondlife.dll"/>

+      <Reference name="Axiom.MathLib.dll"/>

+      <Reference name="Db4objects.Db4o.dll"/>

+      <Reference name="OpenSim.Terrain.BasicTerrain"/>

+      <Reference name="OpenSim.Framework"/>

+      <Reference name="OpenSim.Framework.Console"/>

+      <Reference name="OpenSim.Physics.Manager"/>

+      <Reference name="OpenSim.Servers"/>

+      <Reference name="OpenSim.RegionServer"/>

+      <Reference name="OpenSim.GenericConfig.Xml"/>

+      <Reference name="XMLRPC"/>

 

-     <Files>

-       <Match pattern="*.cs" recurse="true"/>

-     </Files>

+      <Files>

+        <Match pattern="*.cs" recurse="true"/>

+      </Files>

     </Project>

+  

+</Solution>

+  

+  

+<Solution name="OpenSim" activeConfig="Debug" path="./">

+    <Configuration name="Debug">

+      <Options>

+        <CompilerDefines>TRACE;DEBUG</CompilerDefines>

+        <OptimizeCode>false</OptimizeCode>

+        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>

+        <AllowUnsafe>false</AllowUnsafe>

+        <WarningLevel>4</WarningLevel>

+        <WarningsAsErrors>false</WarningsAsErrors>

+        <SuppressWarnings></SuppressWarnings>

+        <OutputPath>bin</OutputPath>

+        <DebugInformation>true</DebugInformation>

+        <IncrementalBuild>true</IncrementalBuild>

+        <NoStdLib>false</NoStdLib>

+      </Options>

+    </Configuration>

+    <Configuration name="Release">

+      <Options>

+        <CompilerDefines>TRACE</CompilerDefines>

+        <OptimizeCode>true</OptimizeCode>

+        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>

+        <AllowUnsafe>false</AllowUnsafe>

+        <WarningLevel>4</WarningLevel>

+        <WarningsAsErrors>false</WarningsAsErrors>

+        <SuppressWarnings></SuppressWarnings>

+        <OutputPath>bin</OutputPath>

+        <DebugInformation>false</DebugInformation>

+        <IncrementalBuild>true</IncrementalBuild>

+        <NoStdLib>false</NoStdLib>

+      </Options>

+    </Configuration>

 

-    <Project name="OpenGridServices.UserServer" path="OpenGridServices.UserServer" type="Exe">

+ 

+  <!-- OpenGrid Data Services -->

+    <Project name="OpenGrid.Framework.Data" path="OpenGrid.Framework.Data" type="Library">

       <Configuration name="Debug">

         <Options>

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

@@ -488,215 +524,223 @@
           <OutputPath>../bin/</OutputPath>

         </Options>

       </Configuration>

-      

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

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

-     <Reference name="System.Data" localCopy="false"/>

-     <Reference name="System.Xml" localCopy="false"/>

-     <Reference name="OpenSim.Framework"/>

-     <Reference name="OpenSim.Framework.Console"/>

-     <Reference name="OpenGrid.Framework.Data"/>

-     <Reference name="OpenSim.Servers"/>

-     <Reference name="libsecondlife.dll"/>

-     <Reference name="Db4objects.Db4o.dll"/>

-     <Reference name="XMLRPC"/>

 

-     <Files>

-       <Match pattern="*.cs" recurse="true"/>

-     </Files> 

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

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

+      <Reference name="System.Xml"/>

+      <Reference name="System.Data"/>

+      <Reference name="libsecondlife.dll"/>

+      <Files>

+        <Match pattern="*.cs" recurse="true"/>

+      </Files>

     </Project>

-    

 

-    <Project name="OpenSim.Physics.Manager" path="OpenSim.Physics/Manager" type="Library">

+    <Project name="OpenGrid.Framework.Data.MySQL" path="OpenGrid.Framework.Data.MySQL" 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" localCopy="false" />

-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

-      <Reference name="OpenSim.Framework" localCopy="false"/>

-      <Reference name="OpenSim.Framework.Console" localCopy="false"/>

+      <Reference name="System.Xml"/>

+      <Reference name="System.Data"/>

+      <Reference name="OpenGrid.Framework.Data"/>

+      <Reference name="libsecondlife.dll"/>

+      <Reference name="MySql.Data.dll"/>

       <Files>

-        <Match pattern="*.cs" recurse="false"/>

+        <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGrid.Config/GridConfigDb4o" type="Library">

+    <Project name="OpenGrid.Framework.Data.DB4o" path="OpenGrid.Framework.Data.DB4o" 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.Data.dll"/>

       <Reference name="System.Xml"/>

+      <Reference name="System.Data"/>

+      <Reference name="OpenGrid.Framework.Data"/>

       <Reference name="libsecondlife.dll"/>

       <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <Project name="OpenUser.Config.UserConfigDb4o" path="OpenUser.Config/UserConfigDb4o" type="Library">

+    <Project name="OpenGrid.Framework.Data.MSSQL" path="OpenGrid.Framework.Data.MSSQL" 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.Data.dll"/>

       <Reference name="System.Xml"/>

+      <Reference name="System.Data"/>

+      <Reference name="OpenGrid.Framework.Data"/>

       <Reference name="libsecondlife.dll"/>

-      <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="OpenSim.Framework"/>

-      <Reference name="OpenSim.Framework.Console"/>

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-

-    <!-- Physics Plug-ins -->

-    <Project name="OpenSim.Physics.BasicPhysicsPlugin" path="OpenSim.Physics/BasicPhysicsPlugin" type="Library">

+    <Project name="OpenGrid.Framework.Data.SQLite" path="OpenGrid.Framework.Data.SQLite" type="Library">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

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

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

-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

-      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>

+      <Reference name="System.Xml"/>

+      <Reference name="System.Data"/>

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

+      <Reference name="OpenGrid.Framework.Data"/>

+      <Reference name="libsecondlife.dll"/>

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <Project name="OpenSim.Physics.PhysXPlugin" path="OpenSim.Physics/PhysXPlugin" type="Library">

+    <!-- OGS projects -->    

+   

+   <Project name="OpenGrid.Framework.Manager" path="OpenGrid.Framework.Manager" type="Library">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

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

-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

-      <Reference name="PhysX_Wrapper_Dotnet.dll" localCopy="false"/>

-      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>

-      <Files>

-        <Match pattern="*.cs" recurse="true"/>

-      </Files>

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

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

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="XMLRPC"/>

+

+

+     <Files>

+       <Match pattern="*.cs" recurse="true"/>

+     </Files>

     </Project>

 

-    <Project name="OpenSim.Physics.OdePlugin" path="OpenSim.Physics/OdePlugin" type="Library">

+

+   <Project name="ServiceManager" path="ServiceManager" type="Exe">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

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

-      <Reference name="Axiom.MathLib.dll" localCopy="false"/>

-      <Reference name="OpenSim.Physics.Manager" localCopy="false"/>

-      <Reference name="Ode.NET.dll" localCopy="false" />      

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

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

+     <Reference name="System.ServiceProcess" localCopy="false"/>

+     <Reference name="System.Xml" localCopy="false"/>

 

-      <Files>

-        <Match pattern="*.cs" recurse="true"/>

-      </Files>

+     <Files>

+       <Match pattern="*.cs" recurse="true"/>

+     </Files>

     </Project>

 

-     <!-- Xml Config Dll -->

-     <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library">

+ 

+    <Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe">

       <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>

-      <Reference name="System"/>

-      <Reference name="System.Xml"/>

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

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

+     <Reference name="System.Data" localCopy="false"/>

+     <Reference name="System.Xml" localCopy="false"/>

      <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="OpenGrid.Framework.Data"/>

+     <Reference name="OpenGrid.Framework.Manager"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

 

-      <Files>

-        <Match pattern="*.cs" recurse="true"/>

-      </Files>

+     <Files>

+       <Match pattern="*.cs" recurse="true"/>

+     </Files>

     </Project>

 

-        <!-- Basic embedded JVM -->

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

+ <Project name="OpenGridServices.AssetServer" path="OpenGridServices.AssetServer" type="Exe">

       <Configuration name="Debug">

         <Options>

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

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

         </Options>

       </Configuration>

       <Configuration name="Release">

         <Options>

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

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

         </Options>

       </Configuration>

 

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

-      <Reference name="System"/>

-      <Reference name="System.Xml"/>

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

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

+     <Reference name="System.Data" localCopy="false"/>

+     <Reference name="System.Xml" localCopy="false"/>

      <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenSim.GridInterfaces.Local"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

 

-      <Files>

-        <Match pattern="*.cs" recurse="true"/>

-      </Files>

+     <Files>

+       <Match pattern="*.cs" recurse="true"/>

+     </Files>

     </Project>

 

-

-     <!-- Terrain engine -->

-     <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim.Terrain.BasicTerrain" type="Library">

+    <Project name="OpenGridServices.UserServer" path="OpenGridServices.UserServer" type="Exe">

       <Configuration name="Debug">

         <Options>

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

@@ -707,91 +751,77 @@
           <OutputPath>../bin/</OutputPath>

         </Options>

       </Configuration>

+      

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

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

+     <Reference name="System.Data" localCopy="false"/>

+     <Reference name="System.Xml" localCopy="false"/>

+     <Reference name="OpenSim.Framework"/>

+     <Reference name="OpenSim.Framework.Console"/>

+     <Reference name="OpenGrid.Framework.Data"/>

+     <Reference name="OpenSim.Servers"/>

+     <Reference name="libsecondlife.dll"/>

+     <Reference name="Db4objects.Db4o.dll"/>

+     <Reference name="XMLRPC"/>

 

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

-      <Reference name="libTerrain-BSD.dll"/>

-      <Reference name="System"/>

-      <Reference name="System.Drawing"/>

-      <Reference name="System.Data"/>

-      <Reference name="System.Xml"/>

-

-      <Files>

-        <Match pattern="*.cs" recurse="true"/>

-      </Files>

+     <Files>

+       <Match pattern="*.cs" recurse="true"/>

+     </Files> 

     </Project>

 

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

+

+

+    <Project name="OpenGrid.Config.GridConfigDb4o" path="OpenGrid.Config/GridConfigDb4o" 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.Data.dll"/>

       <Reference name="System.Xml"/>

       <Reference name="libsecondlife.dll"/>

-      <Reference name="Axiom.MathLib.dll"/>

       <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="OpenSim.Terrain.BasicTerrain"/>

       <Reference name="OpenSim.Framework"/>

       <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="OpenSim.GenericConfig.Xml"/>

-      <Reference name="OpenSim.Physics.Manager"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="XMLRPC"/>

-

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

 

-    <!-- OpenSim app -->

-    <Project name="OpenSim" path="OpenSim" type="Exe">

+    <Project name="OpenUser.Config.UserConfigDb4o" path="OpenUser.Config/UserConfigDb4o" 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.Data.dll"/>

       <Reference name="System.Xml"/>

       <Reference name="libsecondlife.dll"/>

-      <Reference name="Axiom.MathLib.dll"/>

       <Reference name="Db4objects.Db4o.dll"/>

-      <Reference name="OpenSim.Terrain.BasicTerrain"/>

       <Reference name="OpenSim.Framework"/>

       <Reference name="OpenSim.Framework.Console"/>

-      <Reference name="OpenSim.Physics.Manager"/>

-      <Reference name="OpenSim.Servers"/>

-      <Reference name="OpenSim.RegionServer"/>

-      <Reference name="OpenSim.GenericConfig.Xml"/>

-      <Reference name="XMLRPC"/>

-

       <Files>

         <Match pattern="*.cs" recurse="true"/>

       </Files>

     </Project>

-

-    

-  </Solution>

-  

-  

-  

- 

- 

   

+</Solution>

   

   

   <!-- Prebuild tool -->