aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj372
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs6
-rw-r--r--OpenSim.RegionServer/world/World.cs11
3 files changed, 198 insertions, 191 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 7841e96..e293a8c 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -1,186 +1,186 @@
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>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{58019DB8-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{632E1BFD-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></ApplicationIcon>
10 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.RegionServer</AssemblyName> 12 <AssemblyName>OpenSim.RegionServer</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript> 13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> 14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenSim.RegionServer</RootNamespace> 19 <RootNamespace>OpenSim.RegionServer</RootNamespace>
20 <StartupObject></StartupObject> 20 <StartupObject></StartupObject>
21 <FileUpgradeFlags> 21 <FileUpgradeFlags>
22 </FileUpgradeFlags> 22 </FileUpgradeFlags>
23 </PropertyGroup> 23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress> 26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> 27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>False</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
34 <Optimize>True</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>
39 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 40 <NoWarn></NoWarn>
41 </PropertyGroup> 41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress> 44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> 45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE;DEBUG</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>True</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>False</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>
57 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 58 <NoWarn></NoWarn>
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="System.Xml" > 65 <Reference Include="System.Xml" >
66 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.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="Axiom.MathLib.dll" > 73 <Reference Include="Axiom.MathLib.dll" >
74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath> 74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
75 <Private>False</Private> 75 <Private>False</Private>
76 </Reference> 76 </Reference>
77 <Reference Include="Db4objects.Db4o.dll" > 77 <Reference Include="Db4objects.Db4o.dll" >
78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private> 79 <Private>False</Private>
80 </Reference> 80 </Reference>
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> 83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name> 84 <Name>OpenSim.Framework</Name>
85 <Project>{7404933D-0000-0000-0000-000000000000}</Project> 85 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 87 <Private>False</Private>
88 </ProjectReference> 88 </ProjectReference>
89 <ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> 89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name> 90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{16759386-0000-0000-0000-000000000000}</Project> 91 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
95 <ProjectReference Include="../OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj"> 95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
96 <Name>OpenSim.Physics.Manager</Name> 96 <Name>OpenSim.Physics.Manager</Name>
97 <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> 97 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private> 99 <Private>False</Private>
100 </ProjectReference> 100 </ProjectReference>
101 <ProjectReference Include="../Servers/OpenSim.Servers.csproj"> 101 <ProjectReference Include="..\Servers\OpenSim.Servers.csproj">
102 <Name>OpenSim.Servers</Name> 102 <Name>OpenSim.Servers</Name>
103 <Project>{111F9E8F-0000-0000-0000-000000000000}</Project> 103 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 105 <Private>False</Private>
106 </ProjectReference> 106 </ProjectReference>
107 </ItemGroup> 107 </ItemGroup>
108 <ItemGroup> 108 <ItemGroup>
109 <Compile Include="AgentAssetUpload.cs"> 109 <Compile Include="AgentAssetUpload.cs">
110 <SubType>Code</SubType> 110 <SubType>Code</SubType>
111 </Compile> 111 </Compile>
112 <Compile Include="ConsoleCmds.cs"> 112 <Compile Include="ConsoleCmds.cs">
113 <SubType>Code</SubType> 113 <SubType>Code</SubType>
114 </Compile> 114 </Compile>
115 <Compile Include="Grid.cs"> 115 <Compile Include="Grid.cs">
116 <SubType>Code</SubType> 116 <SubType>Code</SubType>
117 </Compile> 117 </Compile>
118 <Compile Include="OpenSimMain.cs"> 118 <Compile Include="OpenSimMain.cs">
119 <SubType>Code</SubType> 119 <SubType>Code</SubType>
120 </Compile> 120 </Compile>
121 <Compile Include="OpenSimNetworkHandler.cs"> 121 <Compile Include="OpenSimNetworkHandler.cs">
122 <SubType>Code</SubType> 122 <SubType>Code</SubType>
123 </Compile> 123 </Compile>
124 <Compile Include="PacketServer.cs"> 124 <Compile Include="PacketServer.cs">
125 <SubType>Code</SubType> 125 <SubType>Code</SubType>
126 </Compile> 126 </Compile>
127 <Compile Include="QueItem.cs"> 127 <Compile Include="QueItem.cs">
128 <SubType>Code</SubType> 128 <SubType>Code</SubType>
129 </Compile> 129 </Compile>
130 <Compile Include="SimClient.cs"> 130 <Compile Include="SimClient.cs">
131 <SubType>Code</SubType> 131 <SubType>Code</SubType>
132 </Compile> 132 </Compile>
133 <Compile Include="SimConsole.cs"> 133 <Compile Include="SimConsole.cs">
134 <SubType>Code</SubType> 134 <SubType>Code</SubType>
135 </Compile> 135 </Compile>
136 <Compile Include="VersionInfo.cs"> 136 <Compile Include="VersionInfo.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 <Compile Include="Assets/AssetCache.cs"> 139 <Compile Include="Assets\AssetCache.cs">
140 <SubType>Code</SubType> 140 <SubType>Code</SubType>
141 </Compile> 141 </Compile>
142 <Compile Include="Assets/InventoryCache.cs"> 142 <Compile Include="Assets\InventoryCache.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="CAPS/AdminWebFront.cs"> 145 <Compile Include="CAPS\AdminWebFront.cs">
146 <SubType>Code</SubType> 146 <SubType>Code</SubType>
147 </Compile> 147 </Compile>
148 <Compile Include="types/Mesh.cs"> 148 <Compile Include="types\Mesh.cs">
149 <SubType>Code</SubType> 149 <SubType>Code</SubType>
150 </Compile> 150 </Compile>
151 <Compile Include="types/Triangle.cs"> 151 <Compile Include="types\Triangle.cs">
152 <SubType>Code</SubType> 152 <SubType>Code</SubType>
153 </Compile> 153 </Compile>
154 <Compile Include="world/Avatar.cs"> 154 <Compile Include="world\Avatar.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="world/AvatarAnimations.cs"> 157 <Compile Include="world\AvatarAnimations.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="world/Entity.cs"> 160 <Compile Include="world\Entity.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="world/Primitive.cs"> 163 <Compile Include="world\Primitive.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="world/ScriptEngine.cs"> 166 <Compile Include="world\ScriptEngine.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="world/SurfacePatch.cs"> 169 <Compile Include="world\SurfacePatch.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="world/World.cs"> 172 <Compile Include="world\World.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="world/scripting/IScript.cs"> 175 <Compile Include="world\scripting\IScript.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 </ItemGroup> 178 </ItemGroup>
179 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 179 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
180 <PropertyGroup> 180 <PropertyGroup>
181 <PreBuildEvent> 181 <PreBuildEvent>
182 </PreBuildEvent> 182 </PreBuildEvent>
183 <PostBuildEvent> 183 <PostBuildEvent>
184 </PostBuildEvent> 184 </PostBuildEvent>
185 </PropertyGroup> 185 </PropertyGroup>
186</Project> 186</Project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 74b9e44..bdbe818 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -129,7 +129,7 @@ namespace OpenSim
129 m_console.WriteLine("Main.cs:Startup() - We are " + Cfg.RegionName + " at " + Cfg.RegionLocX.ToString() + "," + Cfg.RegionLocY.ToString()); 129 m_console.WriteLine("Main.cs:Startup() - We are " + Cfg.RegionName + " at " + Cfg.RegionLocX.ToString() + "," + Cfg.RegionLocY.ToString());
130 m_console.WriteLine("Initialising world"); 130 m_console.WriteLine("Initialising world");
131 LocalWorld = new World(this._packetServer.ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg); 131 LocalWorld = new World(this._packetServer.ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg);
132 LocalWorld.LandMap = Cfg.LoadWorld(); 132 //LocalWorld.LandMap = Cfg.LoadWorld();
133 LocalWorld.InventoryCache = InventoryCache; 133 LocalWorld.InventoryCache = InventoryCache;
134 LocalWorld.AssetCache = AssetCache; 134 LocalWorld.AssetCache = AssetCache;
135 135
@@ -139,6 +139,9 @@ namespace OpenSim
139 this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); 139 this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
140 this.physManager.LoadPlugins(); 140 this.physManager.LoadPlugins();
141 141
142 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
143 LocalWorld.LoadWorldMap();
144
142 m_console.WriteLine("Main.cs:Startup() - Starting up messaging system"); 145 m_console.WriteLine("Main.cs:Startup() - Starting up messaging system");
143 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use 146 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use
144 LocalWorld.PhysScene.SetTerrain(LocalWorld.LandMap); 147 LocalWorld.PhysScene.SetTerrain(LocalWorld.LandMap);
@@ -148,7 +151,6 @@ namespace OpenSim
148 IGridServer gridServer = GridServers.GridServer; 151 IGridServer gridServer = GridServers.GridServer;
149 gridServer.SetServerInfo(Cfg.GridURL, Cfg.GridSendKey, Cfg.GridRecvKey); 152 gridServer.SetServerInfo(Cfg.GridURL, Cfg.GridSendKey, Cfg.GridRecvKey);
150 153
151 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
152 LocalWorld.LoadPrimsFromStorage(); 154 LocalWorld.LoadPrimsFromStorage();
153 155
154 if (m_sandbox) 156 if (m_sandbox)
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index aea889d..4f8e53d 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -150,7 +150,7 @@ namespace OpenSim.world
150 { 150 {
151 this.phyScene.SetTerrain(this.LandMap); 151 this.phyScene.SetTerrain(this.LandMap);
152 } 152 }
153 m_cfg.SaveMap(this.LandMap); 153 this.localStorage.SaveMap(this.LandMap);
154 154
155 foreach (SimClient client in m_clientThreads.Values) 155 foreach (SimClient client in m_clientThreads.Values)
156 { 156 {
@@ -171,7 +171,7 @@ namespace OpenSim.world
171 { 171 {
172 this.phyScene.SetTerrain(this.LandMap); 172 this.phyScene.SetTerrain(this.LandMap);
173 } 173 }
174 m_cfg.SaveMap(this.LandMap); 174 this.localStorage.SaveMap(this.LandMap);
175 175
176 foreach (SimClient client in m_clientThreads.Values) 176 foreach (SimClient client in m_clientThreads.Values)
177 { 177 {
@@ -192,7 +192,7 @@ namespace OpenSim.world
192 { 192 {
193 this.phyScene.SetTerrain(this.LandMap); 193 this.phyScene.SetTerrain(this.LandMap);
194 } 194 }
195 m_cfg.SaveMap(this.LandMap); 195 this.localStorage.SaveMap(this.LandMap);
196 196
197 foreach (SimClient client in m_clientThreads.Values) 197 foreach (SimClient client in m_clientThreads.Values)
198 { 198 {
@@ -201,6 +201,11 @@ namespace OpenSim.world
201 } 201 }
202 } 202 }
203 203
204 public void LoadWorldMap()
205 {
206 LandMap = this.localStorage.LoadWorld();
207 }
208
204 public void LoadPrimsFromStorage() 209 public void LoadPrimsFromStorage()
205 { 210 {
206 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives"); 211 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");
generated by cgit v1.1 at 2024-11-11 23:09:37 +0000