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

43 files changed, 78 insertions, 14 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