*Some more restructuring/fixing -- should compile, but high chance I forgot to add/remove something

This commit is contained in:
mingchen
2007-06-27 16:39:11 +00:00
parent 646bbbc84b
commit e41eedc9ae
74 changed files with 231 additions and 1331 deletions

View File

@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
using libsecondlife;
using OpenSim.Region;
using Avatar=OpenSim.Region.Scenes.ScenePresence;
using OpenSim.Region.Scenes;
using OpenSim.Region.Environment;
using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework;
using OpenSim.Caches;
using OpenGrid.Framework.Communications;
using OpenSim.Servers;
using OpenSim.Region.Caches;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
namespace SimpleApp
{
public class MyWorld : Scene
{
private RegionInfo m_regionInfo;
private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars;
public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
: base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
@@ -76,7 +76,7 @@ namespace SimpleApp
client.SendRegionHandshake(m_regionInfo);
OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
}

View File

@@ -6,13 +6,14 @@ using OpenSim.GridInterfaces.Local;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Assets;
using libsecondlife;
using OpenSim.Servers;
using OpenSim.Framework;
using OpenSim.Caches;
using OpenGrid.Framework.Communications;
using OpenSim.LocalCommunications;
using OpenSim.Region.Caches;
using OpenSim.Framework.Communications;
using OpenSim.Region.Communications.Local;
using OpenSim.Region.ClientStack;
namespace SimpleApp
{

View File

@@ -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>{24B12448-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>SimpleApp</AssemblyName>
@@ -15,9 +16,11 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Exe</OutputType>
<AppDesignerFolder></AppDesignerFolder>
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>SimpleApp</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,30 +61,27 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<NoWarn></NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="libsecondlife.dll" >
<Reference Include="libsecondlife.dll">
<HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OpenSim.Servers" >
<HintPath>OpenSim.Servers.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" >
<Reference Include="System">
<HintPath>System.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Data.dll" >
<Reference Include="System.Data.dll">
<HintPath>..\..\..\..\bin\System.Data.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="XMLRPC.dll" >
<Reference Include="XMLRPC.dll">
<HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
<Private>False</Private>
</Reference>
@@ -88,49 +91,51 @@
<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="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
<Name>OpenSim.Framework.Communications</Name>
<Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\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="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
<Project>{2CC71860-0000-0000-0000-000000000000}</Project>
<Name>OpenSim.Framework.Servers</Name>
</ProjectReference>
<ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
<Name>OpenSim.Region.Caches</Name>
<Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
<Name>OpenSim.Region.ClientStack</Name>
<Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
<Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
<Name>OpenSim.Region.Communications.Local</Name>
</ProjectReference>
<ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
<Name>OpenSim.Region.GridInterfaces.Local</Name>
<Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj">
<Name>OpenSim.Region.LocalCommunications</Name>
<Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj">
<Name>OpenSim.Region.Simulation</Name>
<ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
<Name>OpenSim.Region.Environment</Name>
<Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -151,4 +156,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>