aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyWorld.cs16
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs9
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj71
3 files changed, 51 insertions, 45 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 01e0c59..89f39d3 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Types; 5using OpenSim.Framework.Types;
6using OpenSim.Framework.Console; 6using OpenSim.Framework.Console;
7using libsecondlife; 7using libsecondlife;
8using OpenSim.Region; 8using OpenSim.Region.Environment;
9using Avatar=OpenSim.Region.Scenes.ScenePresence; 9using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
10using OpenSim.Region.Scenes; 10using OpenSim.Region.Environment.Scenes;
11using OpenSim.Framework; 11using OpenSim.Framework;
12using OpenSim.Caches; 12using OpenSim.Region.Caches;
13using OpenGrid.Framework.Communications; 13using OpenSim.Framework.Communications;
14using OpenSim.Servers; 14using OpenSim.Framework.Servers;
15 15
16namespace SimpleApp 16namespace SimpleApp
17{ 17{
18 public class MyWorld : Scene 18 public class MyWorld : Scene
19 { 19 {
20 private RegionInfo m_regionInfo; 20 private RegionInfo m_regionInfo;
21 private List<OpenSim.Region.Scenes.ScenePresence> m_avatars; 21 private List<OpenSim.Region.Environment.Scenes.ScenePresence> m_avatars;
22 22
23 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer) 23 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
24 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer) 24 : base(clientThreads, regionInfo, authen, commsMan, assetCach, httpServer)
@@ -76,7 +76,7 @@ namespace SimpleApp
76 76
77 client.SendRegionHandshake(m_regionInfo); 77 client.SendRegionHandshake(m_regionInfo);
78 78
79 OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo ); 79 OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
80 80
81 } 81 }
82 82
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index e1465d1..8c1e965 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -6,13 +6,14 @@ using OpenSim.GridInterfaces.Local;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
8using OpenSim.Framework.Console; 8using OpenSim.Framework.Console;
9using OpenSim.Framework.Servers;
9using OpenSim.Assets; 10using OpenSim.Assets;
10using libsecondlife; 11using libsecondlife;
11using OpenSim.Servers;
12using OpenSim.Framework; 12using OpenSim.Framework;
13using OpenSim.Caches; 13using OpenSim.Region.Caches;
14using OpenGrid.Framework.Communications; 14using OpenSim.Framework.Communications;
15using OpenSim.LocalCommunications; 15using OpenSim.Region.Communications.Local;
16using OpenSim.Region.ClientStack;
16 17
17namespace SimpleApp 18namespace SimpleApp
18{ 19{
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 5129be2..8a62af4 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>SimpleApp</AssemblyName> 13 <AssemblyName>SimpleApp</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 18 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>SimpleApp</RootNamespace> 21 <RootNamespace>SimpleApp</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,30 +61,27 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="OpenSim.Servers" > 72 <Reference Include="System">
66 <HintPath>OpenSim.Servers.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="System" >
70 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
71 <Private>False</Private> 74 <Private>False</Private>
72 </Reference> 75 </Reference>
73 <Reference Include="System.Data.dll" > 76 <Reference Include="System.Data.dll">
74 <HintPath>..\..\..\..\bin\System.Data.dll</HintPath> 77 <HintPath>..\..\..\..\bin\System.Data.dll</HintPath>
75 <Private>False</Private> 78 <Private>False</Private>
76 </Reference> 79 </Reference>
77 <Reference Include="System.Xml" > 80 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 81 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 82 <Private>False</Private>
80 </Reference> 83 </Reference>
81 <Reference Include="XMLRPC.dll" > 84 <Reference Include="XMLRPC.dll">
82 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath> 85 <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath>
83 <Private>False</Private> 86 <Private>False</Private>
84 </Reference> 87 </Reference>
@@ -88,49 +91,51 @@
88 <Name>OpenSim.Framework</Name> 91 <Name>OpenSim.Framework</Name>
89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 92 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 93 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 94 <Private>False</Private>
92 </ProjectReference> 95 </ProjectReference>
93 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> 96 <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
94 <Name>OpenSim.Framework.Communications</Name> 97 <Name>OpenSim.Framework.Communications</Name>
95 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> 98 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 100 <Private>False</Private>
98 </ProjectReference> 101 </ProjectReference>
99 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> 102 <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
100 <Name>OpenSim.Framework.Console</Name> 103 <Name>OpenSim.Framework.Console</Name>
101 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 106 <Private>False</Private>
107 </ProjectReference>
108 <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
109 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
110 <Name>OpenSim.Framework.Servers</Name>
104 </ProjectReference> 111 </ProjectReference>
105 <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj"> 112 <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
106 <Name>OpenSim.Region.Caches</Name> 113 <Name>OpenSim.Region.Caches</Name>
107 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> 114 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 115 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 116 <Private>False</Private>
110 </ProjectReference> 117 </ProjectReference>
111 <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj"> 118 <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">
112 <Name>OpenSim.Region.ClientStack</Name> 119 <Name>OpenSim.Region.ClientStack</Name>
113 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> 120 <Project>{DC3698B2-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 121 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 122 <Private>False</Private>
123 </ProjectReference>
124 <ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj">
125 <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
126 <Name>OpenSim.Region.Communications.Local</Name>
116 </ProjectReference> 127 </ProjectReference>
117 <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj"> 128 <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj">
118 <Name>OpenSim.Region.GridInterfaces.Local</Name> 129 <Name>OpenSim.Region.GridInterfaces.Local</Name>
119 <Project>{241A8CDD-0000-0000-0000-000000000000}</Project> 130 <Project>{241A8CDD-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 131 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 132 <Private>False</Private>
122 </ProjectReference>
123 <ProjectReference Include="..\..\LocalCommunications\OpenSim.Region.LocalCommunications.csproj">
124 <Name>OpenSim.Region.LocalCommunications</Name>
125 <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private>
128 </ProjectReference> 133 </ProjectReference>
129 <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj"> 134 <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
130 <Name>OpenSim.Region.Simulation</Name> 135 <Name>OpenSim.Region.Environment</Name>
131 <Project>{C0DAB338-0000-0000-0000-000000000000}</Project> 136 <Project>{C0DAB338-0000-0000-0000-000000000000}</Project>
132 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 137 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
133 <Private>False</Private> 138 <Private>False</Private>
134 </ProjectReference> 139 </ProjectReference>
135 </ItemGroup> 140 </ItemGroup>
136 <ItemGroup> 141 <ItemGroup>
@@ -151,4 +156,4 @@
151 <PostBuildEvent> 156 <PostBuildEvent>
152 </PostBuildEvent> 157 </PostBuildEvent>
153 </PropertyGroup> 158 </PropertyGroup>
154</Project> 159</Project> \ No newline at end of file