Deleted files under OpenSim.Framework/Interfaces/Remoting/ as they are currently unused and would need rewriting when we do get .net remoting added.

Fixed compile error that happened due to the deleting of ClientView.Grid.

2 files changed, 26 insertions, 32 deletions

diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
index b86d9e8..c6749a1 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.ProcessPackets.cs
@@ -81,7 +81,7 @@ namespace OpenSim
                         }

                         break;

 

-                    #region New Event System - World/Avatar

+                    #region  World/Avatar

                     case PacketType.ChatFromViewer:

                         ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;

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

@@ -163,7 +163,7 @@ namespace OpenSim
                         {

                             OnCompleteMovementToRegion();

                         }

-                        this.EnableNeighbours();

+                       // this.EnableNeighbours();

                         break;

                     case PacketType.AgentUpdate:

                         if (OnAgentUpdate != null)

@@ -190,7 +190,7 @@ namespace OpenSim
 

                     #endregion

 

-                    #region New Event System - Objects/Prims

+                    #region Objects/Prims

                     case PacketType.ObjectLink:

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

                         ObjectLinkPacket link = (ObjectLinkPacket)Pack;

@@ -521,6 +521,7 @@ namespace OpenSim
                         }

                         break;

                     #endregion

+

                     #region unimplemented handlers

                     case PacketType.AgentIsNowWearing:

                         // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 3e6c1ea..c71e60c 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.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,8 +6,7 @@
     <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.RegionServer</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.RegionServer</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

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

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,27 +55,26 @@
     <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.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="Axiom.MathLib.dll">

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

       <HintPath>..\..\bin\Axiom.MathLib.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>

@@ -91,49 +84,49 @@
       <Name>OpenSim.Terrain.BasicTerrain</Name>

       <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

       <Name>OpenSim.Framework</Name>

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

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

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

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

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">

       <Name>OpenSim.GenericConfig.Xml</Name>

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

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

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

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

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

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

       <Name>OpenSim.Servers</Name>

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

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">

       <Name>OpenSim.Caches</Name>

       <Project>{1938EB12-0000-0000-0000-000000000000}</Project>

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

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">

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

@@ -187,4 +180,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>