diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/MyWorld.cs (renamed from OpenSim/Examples/SimpleApp/MyWorld.cs) | 16 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs (renamed from OpenSim/Examples/SimpleApp/Program.cs) | 11 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs (renamed from OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj (renamed from OpenSim/Examples/SimpleApp/SimpleApp.csproj) | 68 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build (renamed from OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build) | 36 |
5 files changed, 66 insertions, 65 deletions
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs index 01e0c59..89f39d3 100644 --- a/OpenSim/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs | |||
@@ -5,20 +5,20 @@ using OpenSim.Framework.Interfaces; | |||
5 | using OpenSim.Framework.Types; | 5 | using OpenSim.Framework.Types; |
6 | using OpenSim.Framework.Console; | 6 | using OpenSim.Framework.Console; |
7 | using libsecondlife; | 7 | using libsecondlife; |
8 | using OpenSim.Region; | 8 | using OpenSim.Region.Environment; |
9 | using Avatar=OpenSim.Region.Scenes.ScenePresence; | 9 | using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence; |
10 | using OpenSim.Region.Scenes; | 10 | using OpenSim.Region.Environment.Scenes; |
11 | using OpenSim.Framework; | 11 | using OpenSim.Framework; |
12 | using OpenSim.Caches; | 12 | using OpenSim.Region.Caches; |
13 | using OpenGrid.Framework.Communications; | 13 | using OpenSim.Framework.Communications; |
14 | using OpenSim.Servers; | 14 | using OpenSim.Framework.Servers; |
15 | 15 | ||
16 | namespace SimpleApp | 16 | namespace 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/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index e1465d1..4060d68 100644 --- a/OpenSim/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -2,17 +2,18 @@ using System; | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim; | 4 | using OpenSim; |
5 | using OpenSim.GridInterfaces.Local; | 5 | using OpenSim.Region.GridInterfaces.Local; |
6 | using OpenSim.Framework.Interfaces; | 6 | using OpenSim.Framework.Interfaces; |
7 | using OpenSim.Framework.Types; | 7 | using OpenSim.Framework.Types; |
8 | using OpenSim.Framework.Console; | 8 | using OpenSim.Framework.Console; |
9 | using OpenSim.Framework.Servers; | ||
9 | using OpenSim.Assets; | 10 | using OpenSim.Assets; |
10 | using libsecondlife; | 11 | using libsecondlife; |
11 | using OpenSim.Servers; | ||
12 | using OpenSim.Framework; | 12 | using OpenSim.Framework; |
13 | using OpenSim.Caches; | 13 | using OpenSim.Region.Caches; |
14 | using OpenGrid.Framework.Communications; | 14 | using OpenSim.Framework.Communications; |
15 | using OpenSim.LocalCommunications; | 15 | using OpenSim.Region.Communications.Local; |
16 | using OpenSim.Region.ClientStack; | ||
16 | 17 | ||
17 | namespace SimpleApp | 18 | namespace SimpleApp |
18 | { | 19 | { |
diff --git a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs index 0f9bf0f..0f9bf0f 100644 --- a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Examples/SimpleApp/Properties/AssemblyInfo.cs | |||
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj index 00af44a..0a82172 100644 --- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | |||
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\..\..\bin\</OutputPath> | 35 | <OutputPath>..\..\..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\..\bin\</OutputPath> | 53 | <OutputPath>..\..\..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -59,7 +59,7 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="libsecondlife.dll" > | 61 | <Reference Include="libsecondlife.dll" > |
62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 62 | <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System" > | 65 | <Reference Include="System" > |
@@ -67,72 +67,70 @@ | |||
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="System.Data.dll" > | 69 | <Reference Include="System.Data.dll" > |
70 | <HintPath>..\..\..\bin\System.Data.dll</HintPath> | 70 | <HintPath>..\..\..\..\bin\System.Data.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="System.Xml" > | 73 | <Reference Include="System.Xml" > |
74 | <HintPath>System.Xml.dll</HintPath> | 74 | <HintPath>System.Xml.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="XMLRPC.dll" > | ||
78 | <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath> | ||
79 | <Private>False</Private> | ||
80 | </Reference> | ||
77 | </ItemGroup> | 81 | </ItemGroup> |
78 | <ItemGroup> | 82 | <ItemGroup> |
79 | <ProjectReference Include="..\..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | 83 | <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj"> |
80 | <Name>OpenGrid.Framework.Communications</Name> | 84 | <Name>OpenSim.Framework</Name> |
81 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> | 85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
83 | <Private>False</Private> | ||
84 | </ProjectReference> | ||
85 | <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj"> | ||
86 | <Name>OpenSim.Caches</Name> | ||
87 | <Project>{1938EB12-0000-0000-0000-000000000000}</Project> | ||
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
89 | <Private>False</Private> | 87 | <Private>False</Private> |
90 | </ProjectReference> | 88 | </ProjectReference> |
91 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> |
92 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework.Communications</Name> |
93 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 91 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> |
94 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
95 | <Private>False</Private> | 93 | <Private>False</Private> |
96 | </ProjectReference> | 94 | </ProjectReference> |
97 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 95 | <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
98 | <Name>OpenSim.Framework.Console</Name> | 96 | <Name>OpenSim.Framework.Console</Name> |
99 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
100 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
101 | <Private>False</Private> | 99 | <Private>False</Private> |
102 | </ProjectReference> | 100 | </ProjectReference> |
103 | <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj"> | 101 | <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> |
104 | <Name>OpenSim.GridInterfaces.Local</Name> | 102 | <Name>OpenSim.Framework.Servers</Name> |
105 | <Project>{546099CD-0000-0000-0000-000000000000}</Project> | 103 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> |
106 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
107 | <Private>False</Private> | 105 | <Private>False</Private> |
108 | </ProjectReference> | 106 | </ProjectReference> |
109 | <ProjectReference Include="..\..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj"> | 107 | <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj"> |
110 | <Name>OpenSim.LocalCommunications</Name> | 108 | <Name>OpenSim.Region.Caches</Name> |
111 | <Project>{79CED992-0000-0000-0000-000000000000}</Project> | 109 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> |
112 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
113 | <Private>False</Private> | 111 | <Private>False</Private> |
114 | </ProjectReference> | 112 | </ProjectReference> |
115 | <ProjectReference Include="..\..\OpenSim.Region\OpenSim.Region.csproj"> | 113 | <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj"> |
116 | <Name>OpenSim.Region</Name> | 114 | <Name>OpenSim.Region.ClientStack</Name> |
117 | <Project>{196916AF-0000-0000-0000-000000000000}</Project> | 115 | <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> |
118 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
119 | <Private>False</Private> | 117 | <Private>False</Private> |
120 | </ProjectReference> | 118 | </ProjectReference> |
121 | <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> | 119 | <ProjectReference Include="..\..\Communications\Local\OpenSim.Region.Communications.Local.csproj"> |
122 | <Name>OpenSim.RegionServer</Name> | 120 | <Name>OpenSim.Region.Communications.Local</Name> |
123 | <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> | 121 | <Project>{BFB5D807-0000-0000-0000-000000000000}</Project> |
124 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
125 | <Private>False</Private> | 123 | <Private>False</Private> |
126 | </ProjectReference> | 124 | </ProjectReference> |
127 | <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 125 | <ProjectReference Include="..\..\Environment\OpenSim.Region.Environment.csproj"> |
128 | <Name>OpenSim.Servers</Name> | 126 | <Name>OpenSim.Region.Environment</Name> |
129 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 127 | <Project>{DCBA491C-0000-0000-0000-000000000000}</Project> |
130 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 128 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
131 | <Private>False</Private> | 129 | <Private>False</Private> |
132 | </ProjectReference> | 130 | </ProjectReference> |
133 | <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 131 | <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj"> |
134 | <Name>XMLRPC</Name> | 132 | <Name>OpenSim.Region.GridInterfaces.Local</Name> |
135 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 133 | <Project>{241A8CDD-0000-0000-0000-000000000000}</Project> |
136 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 134 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
137 | <Private>False</Private> | 135 | <Private>False</Private> |
138 | </ProjectReference> | 136 | </ProjectReference> |
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build index 60c0f85..f8896fa 100644 --- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.GridServer" default="build"> | 2 | <project name="SimpleApp" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
@@ -8,11 +8,11 @@ | |||
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > | 11 | <resources prefix="SimpleApp" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="GridManager.cs" /> | 14 | <include name="MyWorld.cs" /> |
15 | <include name="Main.cs" /> | 15 | <include name="Program.cs" /> |
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
@@ -20,23 +20,25 @@ | |||
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="../../bin/Db4objects.Db4o.dll" /> | 23 | <include name="../../../../bin/libsecondlife.dll" /> |
24 | <include name="../../bin/libsecondlife.dll" /> | 24 | <include name="../../../../bin/OpenSim.Framework.dll" /> |
25 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | 25 | <include name="../../../../bin/OpenSim.Framework.Communications.dll" /> |
26 | <include name="../../bin/OpenGrid.Framework.Manager.dll" /> | 26 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> |
27 | <include name="../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../../../bin/OpenSim.Region.Caches.dll" /> |
29 | <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> | 29 | <include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> |
30 | <include name="../../bin/OpenSim.Servers.dll" /> | 30 | <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> |
31 | <include name="../../../../bin/OpenSim.Region.Environment.dll" /> | ||
32 | <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> | ||
31 | <include name="System.dll" /> | 33 | <include name="System.dll" /> |
32 | <include name="System.Data.dll" /> | 34 | <include name="System.Data.dll.dll" /> |
33 | <include name="System.Xml.dll" /> | 35 | <include name="System.Xml.dll" /> |
34 | <include name="../../bin/XMLRPC.dll" /> | 36 | <include name="../../../../bin/XMLRPC.dll" /> |
35 | </references> | 37 | </references> |
36 | </csc> | 38 | </csc> |
37 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 39 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> |
38 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 40 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> |
39 | <copy todir="${project::get-base-directory()}/../../bin/"> | 41 | <copy todir="${project::get-base-directory()}/../../../../bin/"> |
40 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 42 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
41 | <include name="*.dll"/> | 43 | <include name="*.dll"/> |
42 | <include name="*.exe"/> | 44 | <include name="*.exe"/> |