diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs (renamed from OpenSim/OpenSim/Application.cs) | 3 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.csproj (renamed from OpenSim/OpenSim/OpenSim.csproj) | 101 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.exe.build | 60 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs (renamed from OpenSim/OpenSim/OpenSimMain.cs) | 62 | ||||
-rw-r--r-- | OpenSim/Region/Application/VersionInfo.cs (renamed from OpenSim/OpenSim.RegionServer/VersionInfo.cs) | 0 |
5 files changed, 148 insertions, 78 deletions
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/Region/Application/Application.cs index 40701b0..1dcd99b 100644 --- a/OpenSim/OpenSim/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | using OpenSim.Framework.Console; | 31 | using OpenSim.Framework.Console; |
32 | using OpenSim.Region.ClientStack; | ||
32 | 33 | ||
33 | namespace OpenSim | 34 | namespace OpenSim |
34 | { | 35 | { |
@@ -108,7 +109,7 @@ namespace OpenSim | |||
108 | sim.m_sandbox = sandBoxMode; | 109 | sim.m_sandbox = sandBoxMode; |
109 | sim.user_accounts = userAccounts; | 110 | sim.user_accounts = userAccounts; |
110 | sim.gridLocalAsset = gridLocalAsset; | 111 | sim.gridLocalAsset = gridLocalAsset; |
111 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying; | 112 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = allowFlying; |
112 | 113 | ||
113 | sim.StartUp(); | 114 | sim.StartUp(); |
114 | 115 | ||
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index 222e2f7..bec85cc 100644 --- a/OpenSim/OpenSim/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.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,15 +59,15 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="Axiom.MathLib.dll" > | 61 | <Reference Include="Axiom.MathLib.dll" > |
62 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 62 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="Db4objects.Db4o.dll" > | 65 | <Reference Include="Db4objects.Db4o.dll" > |
66 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 66 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 69 | <Reference Include="libsecondlife.dll" > |
70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="System" > | 73 | <Reference Include="System" > |
@@ -78,89 +78,93 @@ | |||
78 | <HintPath>System.Xml.dll</HintPath> | 78 | <HintPath>System.Xml.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | <Reference Include="XMLRPC.dll" > | ||
82 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
81 | </ItemGroup> | 85 | </ItemGroup> |
82 | <ItemGroup> | 86 | <ItemGroup> |
83 | <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | 87 | <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj"> |
84 | <Name>OpenGrid.Framework.Communications</Name> | 88 | <Name>OpenSim.Framework</Name> |
85 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> | 89 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 91 | <Private>False</Private> |
88 | </ProjectReference> | 92 | </ProjectReference> |
89 | <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications.OGS1\OpenGrid.Framework.Communications.OGS1.csproj"> | 93 | <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> |
90 | <Name>OpenGrid.Framework.Communications.OGS1</Name> | 94 | <Name>OpenSim.Framework.Communications</Name> |
91 | <Project>{17442AF1-0000-0000-0000-000000000000}</Project> | 95 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 96 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 97 | <Private>False</Private> |
94 | </ProjectReference> | 98 | </ProjectReference> |
95 | <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj"> | 99 | <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
96 | <Name>OpenGrid.Framework.UserManagement</Name> | 100 | <Name>OpenSim.Framework.Console</Name> |
97 | <Project>{DA9A7391-0000-0000-0000-000000000000}</Project> | 101 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 102 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Private>False</Private> | 103 | <Private>False</Private> |
100 | </ProjectReference> | 104 | </ProjectReference> |
101 | <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj"> | 105 | <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj"> |
102 | <Name>OpenSim.Caches</Name> | 106 | <Name>OpenSim.Framework.Data</Name> |
103 | <Project>{1938EB12-0000-0000-0000-000000000000}</Project> | 107 | <Project>{36B72A9B-0000-0000-0000-000000000000}</Project> |
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 108 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
105 | <Private>False</Private> | 109 | <Private>False</Private> |
106 | </ProjectReference> | 110 | </ProjectReference> |
107 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 111 | <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> |
108 | <Name>OpenSim.Framework</Name> | 112 | <Name>OpenSim.Framework.GenericConfig.Xml</Name> |
109 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 113 | <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> |
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 114 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
111 | <Private>False</Private> | 115 | <Private>False</Private> |
112 | </ProjectReference> | 116 | </ProjectReference> |
113 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 117 | <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> |
114 | <Name>OpenSim.Framework.Console</Name> | 118 | <Name>OpenSim.Framework.Servers</Name> |
115 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 119 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> |
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 120 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
117 | <Private>False</Private> | 121 | <Private>False</Private> |
118 | </ProjectReference> | 122 | </ProjectReference> |
119 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> | 123 | <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj"> |
120 | <Name>OpenSim.GenericConfig.Xml</Name> | 124 | <Name>OpenSim.Framework.UserManagement</Name> |
121 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> | 125 | <Project>{586E2916-0000-0000-0000-000000000000}</Project> |
122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 126 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
123 | <Private>False</Private> | 127 | <Private>False</Private> |
124 | </ProjectReference> | 128 | </ProjectReference> |
125 | <ProjectReference Include="..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj"> | 129 | <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> |
126 | <Name>OpenSim.LocalCommunications</Name> | 130 | <Name>OpenSim.Region.Caches</Name> |
127 | <Project>{79CED992-0000-0000-0000-000000000000}</Project> | 131 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> |
128 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 132 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
129 | <Private>False</Private> | 133 | <Private>False</Private> |
130 | </ProjectReference> | 134 | </ProjectReference> |
131 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 135 | <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj"> |
132 | <Name>OpenSim.Physics.Manager</Name> | 136 | <Name>OpenSim.Region.ClientStack</Name> |
133 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 137 | <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> |
134 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 138 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
135 | <Private>False</Private> | 139 | <Private>False</Private> |
136 | </ProjectReference> | 140 | </ProjectReference> |
137 | <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj"> | 141 | <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj"> |
138 | <Name>OpenSim.Region</Name> | 142 | <Name>OpenSim.Region.Communications.Local</Name> |
139 | <Project>{196916AF-0000-0000-0000-000000000000}</Project> | 143 | <Project>{BFB5D807-0000-0000-0000-000000000000}</Project> |
140 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 144 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
141 | <Private>False</Private> | 145 | <Private>False</Private> |
142 | </ProjectReference> | 146 | </ProjectReference> |
143 | <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> | 147 | <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj"> |
144 | <Name>OpenSim.RegionServer</Name> | 148 | <Name>OpenSim.Region.Communications.OGS1</Name> |
145 | <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> | 149 | <Project>{4806E378-0000-0000-0000-000000000000}</Project> |
146 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 150 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
147 | <Private>False</Private> | 151 | <Private>False</Private> |
148 | </ProjectReference> | 152 | </ProjectReference> |
149 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 153 | <ProjectReference Include="..\Environment\OpenSim.Region.Environment.csproj"> |
150 | <Name>OpenSim.Servers</Name> | 154 | <Name>OpenSim.Region.Environment</Name> |
151 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 155 | <Project>{DCBA491C-0000-0000-0000-000000000000}</Project> |
152 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 156 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
153 | <Private>False</Private> | 157 | <Private>False</Private> |
154 | </ProjectReference> | 158 | </ProjectReference> |
155 | <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> | 159 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> |
156 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 160 | <Name>OpenSim.Region.Physics.Manager</Name> |
157 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> | 161 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> |
158 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 162 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
159 | <Private>False</Private> | 163 | <Private>False</Private> |
160 | </ProjectReference> | 164 | </ProjectReference> |
161 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 165 | <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> |
162 | <Name>XMLRPC</Name> | 166 | <Name>OpenSim.Region.Terrain.BasicTerrain</Name> |
163 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 167 | <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> |
164 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 168 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
165 | <Private>False</Private> | 169 | <Private>False</Private> |
166 | </ProjectReference> | 170 | </ProjectReference> |
@@ -172,6 +176,9 @@ | |||
172 | <Compile Include="OpenSimMain.cs"> | 176 | <Compile Include="OpenSimMain.cs"> |
173 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
174 | </Compile> | 178 | </Compile> |
179 | <Compile Include="VersionInfo.cs"> | ||
180 | <SubType>Code</SubType> | ||
181 | </Compile> | ||
175 | </ItemGroup> | 182 | </ItemGroup> |
176 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 183 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
177 | <PropertyGroup> | 184 | <PropertyGroup> |
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build new file mode 100644 index 0000000..6c7d7ac --- /dev/null +++ b/OpenSim/Region/Application/OpenSim.exe.build | |||
@@ -0,0 +1,60 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim" default="build"> | ||
3 | <target name="build"> | ||
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | ||
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | ||
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | ||
7 | <fileset basedir="${project::get-base-directory()}"> | ||
8 | </fileset> | ||
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"> | ||
11 | <resources prefix="OpenSim" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="Application.cs" /> | ||
15 | <include name="OpenSimMain.cs" /> | ||
16 | <include name="VersionInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/Axiom.MathLib.dll" /> | ||
24 | <include name="../../../bin/Db4objects.Db4o.dll" /> | ||
25 | <include name="../../../bin/libsecondlife.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
27 | <include name="../../../bin/OpenSim.Framework.Communications.dll" /> | ||
28 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
29 | <include name="../../../bin/OpenSim.Framework.Data.dll" /> | ||
30 | <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> | ||
31 | <include name="../../../bin/OpenSim.Framework.Servers.dll" /> | ||
32 | <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> | ||
33 | <include name="../../../bin/OpenSim.Region.Caches.dll" /> | ||
34 | <include name="../../../bin/OpenSim.Region.ClientStack.dll" /> | ||
35 | <include name="../../../bin/OpenSim.Region.Communications.Local.dll" /> | ||
36 | <include name="../../../bin/OpenSim.Region.Communications.OGS1.dll" /> | ||
37 | <include name="../../../bin/OpenSim.Region.Environment.dll" /> | ||
38 | <include name="../../../bin/OpenSim.Region.Physics.Manager.dll" /> | ||
39 | <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" /> | ||
40 | <include name="System.dll" /> | ||
41 | <include name="System.Xml.dll" /> | ||
42 | <include name="../../../bin/XMLRPC.dll" /> | ||
43 | </references> | ||
44 | </csc> | ||
45 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
46 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
47 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
48 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
49 | <include name="*.dll"/> | ||
50 | <include name="*.exe"/> | ||
51 | </fileset> | ||
52 | </copy> | ||
53 | </target> | ||
54 | <target name="clean"> | ||
55 | <delete dir="${bin.dir}" failonerror="false" /> | ||
56 | <delete dir="${obj.dir}" failonerror="false" /> | ||
57 | </target> | ||
58 | <target name="doc" description="Creates documentation."> | ||
59 | </target> | ||
60 | </project> | ||
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index b7ec9e6..fcb2493 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -38,30 +38,34 @@ using System.Collections; | |||
38 | using System.Collections.Generic; | 38 | using System.Collections.Generic; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using libsecondlife.Packets; | 40 | using libsecondlife.Packets; |
41 | using OpenSim.Region; | 41 | using OpenSim.Region.Environment; |
42 | using OpenSim.Region.Scenes; | 42 | using OpenSim.Region.Environment.Scenes; |
43 | using OpenSim.Terrain; | 43 | using OpenSim.Region.Terrain; |
44 | using OpenSim.Framework.Interfaces; | 44 | using OpenSim.Framework.Interfaces; |
45 | using OpenSim.Framework.Data; | ||
46 | |||
45 | using OpenSim.Framework.Types; | 47 | using OpenSim.Framework.Types; |
46 | using OpenSim.Framework; | 48 | using OpenSim.Framework; |
47 | using OpenSim.Assets; | 49 | using OpenSim.Assets; |
48 | using OpenSim.Caches; | 50 | using OpenSim.Region.Caches; |
49 | using OpenSim.Framework.Console; | 51 | using OpenSim.Framework.Console; |
50 | using OpenSim.Physics.Manager; | 52 | using OpenSim.Physics.Manager; |
51 | using Nwc.XmlRpc; | 53 | using Nwc.XmlRpc; |
52 | using OpenSim.Servers; | 54 | using OpenSim.Framework.Servers; |
53 | using OpenSim.GenericConfig; | 55 | using OpenSim.GenericConfig; |
54 | using OpenGrid.Framework.Communications; | 56 | using OpenSim.Framework.Communications; |
55 | using OpenSim.LocalCommunications; | 57 | using OpenSim.Region.Communications.OGS1; |
56 | using OpenGrid.Framework.Communications.OGS1; | 58 | using OpenSim.Region.Communications.Local; |
59 | |||
60 | using OpenSim.Region.ClientStack; | ||
57 | 61 | ||
58 | namespace OpenSim | 62 | namespace OpenSim |
59 | { | 63 | { |
60 | 64 | ||
61 | public class OpenSimMain : RegionApplicationBase, conscmd_callback | 65 | public class OpenSimMain : RegionApplicationBase, conscmd_callback |
62 | { | 66 | { |
63 | // private CheckSumServer checkServer; | ||
64 | protected CommunicationsManager commsManager; | 67 | protected CommunicationsManager commsManager; |
68 | // private CheckSumServer checkServer; | ||
65 | 69 | ||
66 | private bool m_silent; | 70 | private bool m_silent; |
67 | private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log"; | 71 | private string m_logFilename = "region-console-" + Guid.NewGuid().ToString() + ".log"; |
@@ -102,19 +106,17 @@ namespace OpenSim | |||
102 | 106 | ||
103 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); | 107 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); |
104 | 108 | ||
105 | CommunicationsLocal sandboxCommunications = null; | ||
106 | if (m_sandbox) | 109 | if (m_sandbox) |
107 | { | 110 | { |
108 | this.SetupLocalGridServers(); | 111 | this.SetupLocalGridServers(); |
109 | // this.checkServer = new CheckSumServer(12036); | 112 | // this.checkServer = new CheckSumServer(12036); |
110 | // this.checkServer.ServerListener(); | 113 | // this.checkServer.ServerListener(); |
111 | sandboxCommunications = new CommunicationsLocal(this.serversData); | 114 | this.commsManager = new CommunicationsLocal(this.serversData); |
112 | this.commsManager = sandboxCommunications; | ||
113 | } | 115 | } |
114 | else | 116 | else |
115 | { | 117 | { |
116 | this.SetupRemoteGridServers(); | 118 | this.SetupRemoteGridServers(); |
117 | this.commsManager = new GridCommsManager(this.serversData); | 119 | this.commsManager = new CommunicationsOGS1(this.serversData); |
118 | } | 120 | } |
119 | 121 | ||
120 | startuptime = DateTime.Now; | 122 | startuptime = DateTime.Now; |
@@ -132,7 +134,7 @@ namespace OpenSim | |||
132 | 134 | ||
133 | if (m_sandbox) | 135 | if (m_sandbox) |
134 | { | 136 | { |
135 | httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod); | 137 | httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod); |
136 | } | 138 | } |
137 | 139 | ||
138 | //Start http server | 140 | //Start http server |
@@ -152,7 +154,7 @@ namespace OpenSim | |||
152 | { | 154 | { |
153 | try | 155 | try |
154 | { | 156 | { |
155 | AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); | 157 | AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); |
156 | InventoryCache = new InventoryCache(); | 158 | InventoryCache = new InventoryCache(); |
157 | } | 159 | } |
158 | catch (Exception e) | 160 | catch (Exception e) |
@@ -167,7 +169,7 @@ namespace OpenSim | |||
167 | { | 169 | { |
168 | try | 170 | try |
169 | { | 171 | { |
170 | AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); | 172 | AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); |
171 | InventoryCache = new InventoryCache(); | 173 | InventoryCache = new InventoryCache(); |
172 | } | 174 | } |
173 | catch (Exception e) | 175 | catch (Exception e) |
@@ -241,14 +243,21 @@ namespace OpenSim | |||
241 | 243 | ||
242 | udpServer.LocalWorld = LocalWorld; | 244 | udpServer.LocalWorld = LocalWorld; |
243 | 245 | ||
244 | LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. | 246 | LocalWorld.LoadStorageDLL("OpenSim.Region.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. |
245 | LocalWorld.LoadWorldMap(); | 247 | LocalWorld.LoadWorldMap(); |
246 | 248 | ||
247 | m_log.Verbose( "Main.cs:Startup() - Starting up messaging system"); | 249 | m_log.Verbose( "Main.cs:Startup() - Starting up messaging system"); |
248 | LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); | 250 | LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); |
249 | LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); | 251 | LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); |
250 | LocalWorld.LoadPrimsFromStorage(); | 252 | LocalWorld.LoadPrimsFromStorage(); |
251 | LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); | 253 | |
254 | //Master Avatar Setup | ||
255 | UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword); | ||
256 | if (masterAvatar != null) | ||
257 | { | ||
258 | LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; | ||
259 | LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); | ||
260 | } | ||
252 | 261 | ||
253 | 262 | ||
254 | LocalWorld.StartTimer(); | 263 | LocalWorld.StartTimer(); |
@@ -358,23 +367,23 @@ namespace OpenSim | |||
358 | case "": | 367 | case "": |
359 | this.m_physicsEngine = "basicphysics"; | 368 | this.m_physicsEngine = "basicphysics"; |
360 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 369 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
361 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; | 370 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; |
362 | break; | 371 | break; |
363 | 372 | ||
364 | case "basicphysics": | 373 | case "basicphysics": |
365 | this.m_physicsEngine = "basicphysics"; | 374 | this.m_physicsEngine = "basicphysics"; |
366 | configData.SetAttribute("PhysicsEngine", "basicphysics"); | 375 | configData.SetAttribute("PhysicsEngine", "basicphysics"); |
367 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = false; | 376 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = false; |
368 | break; | 377 | break; |
369 | 378 | ||
370 | case "RealPhysX": | 379 | case "RealPhysX": |
371 | this.m_physicsEngine = "RealPhysX"; | 380 | this.m_physicsEngine = "RealPhysX"; |
372 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; | 381 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; |
373 | break; | 382 | break; |
374 | 383 | ||
375 | case "OpenDynamicsEngine": | 384 | case "OpenDynamicsEngine": |
376 | this.m_physicsEngine = "OpenDynamicsEngine"; | 385 | this.m_physicsEngine = "OpenDynamicsEngine"; |
377 | OpenSim.Region.Scenes.ScenePresence.PhysicsEngineFlying = true; | 386 | OpenSim.Region.Environment.Scenes.ScenePresence.PhysicsEngineFlying = true; |
378 | break; | 387 | break; |
379 | } | 388 | } |
380 | 389 | ||
@@ -433,13 +442,6 @@ namespace OpenSim | |||
433 | } | 442 | } |
434 | break; | 443 | break; |
435 | 444 | ||
436 | case "script": | ||
437 | for (int i = 0; i < m_localWorld.Count; i++) | ||
438 | { | ||
439 | ((Scene)m_localWorld[i]).scriptManager.RunScriptCmd(cmdparams); | ||
440 | } | ||
441 | break; | ||
442 | |||
443 | case "shutdown": | 445 | case "shutdown": |
444 | Shutdown(); | 446 | Shutdown(); |
445 | break; | 447 | break; |
@@ -463,7 +465,7 @@ namespace OpenSim | |||
463 | m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); | 465 | m_log.Error( "That is " + (DateTime.Now - startuptime).ToString()); |
464 | break; | 466 | break; |
465 | case "users": | 467 | case "users": |
466 | OpenSim.Region.Scenes.ScenePresence TempAv; | 468 | OpenSim.Region.Environment.Scenes.ScenePresence TempAv; |
467 | m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); | 469 | m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP")); |
468 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) | 470 | /* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) |
469 | { | 471 | { |
diff --git a/OpenSim/OpenSim.RegionServer/VersionInfo.cs b/OpenSim/Region/Application/VersionInfo.cs index 5d1354e..5d1354e 100644 --- a/OpenSim/OpenSim.RegionServer/VersionInfo.cs +++ b/OpenSim/Region/Application/VersionInfo.cs | |||