aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ExportBot/ExportBot.csproj263
-rw-r--r--OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj41
-rw-r--r--OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj37
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs6
4 files changed, 301 insertions, 46 deletions
diff --git a/ExportBot/ExportBot.csproj b/ExportBot/ExportBot.csproj
new file mode 100644
index 0000000..95531e4
--- /dev/null
+++ b/ExportBot/ExportBot.csproj
@@ -0,0 +1,263 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{C4071317-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>ExportBot</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>ExportBot</RootNamespace>
20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
59 </PropertyGroup>
60 <ItemGroup>
61 <Reference Include="System" >
62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="System.Xml" >
66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="libsecondlife.dll" >
70 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="openjpegnet.dll" >
74 <HintPath>..\bin\openjpegnet.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="OpenSim.Framework.dll" >
78 <HintPath>..\bin\OpenSim.Framework.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 <Reference Include="OpenSim.Framework.Console.dll" >
82 <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
83 <Private>False</Private>
84 </Reference>
85 <Reference Include="OpenSim.Servers.dll" >
86 <HintPath>..\bin\OpenSim.Servers.dll</HintPath>
87 <Private>False</Private>
88 </Reference>
89 </ItemGroup>
90 <ItemGroup>
91 </ItemGroup>
92 <ItemGroup>
93 <Compile Include="Arguments.cs">
94 <SubType>Code</SubType>
95 </Compile>
96 <Compile Include="ClientManager.cs">
97 <SubType>Code</SubType>
98 </Compile>
99 <Compile Include="Command.cs">
100 <SubType>Code</SubType>
101 </Compile>
102 <Compile Include="Parsing.cs">
103 <SubType>Code</SubType>
104 </Compile>
105 <Compile Include="Program.cs">
106 <SubType>Code</SubType>
107 </Compile>
108 <Compile Include="TestClient.cs">
109 <SubType>Code</SubType>
110 </Compile>
111 <Compile Include="Commands\AppearanceCommand.cs">
112 <SubType>Code</SubType>
113 </Compile>
114 <Compile Include="Commands\CloneProfileCommand.cs">
115 <SubType>Code</SubType>
116 </Compile>
117 <Compile Include="Commands\DebugCommand.cs">
118 <SubType>Code</SubType>
119 </Compile>
120 <Compile Include="Commands\DilationCommand.cs">
121 <SubType>Code</SubType>
122 </Compile>
123 <Compile Include="Commands\DumpOutfitCommand.cs">
124 <SubType>Code</SubType>
125 </Compile>
126 <Compile Include="Commands\ExportCommand.cs">
127 <SubType>Code</SubType>
128 </Compile>
129 <Compile Include="Commands\ExportOutfitCommand.cs">
130 <SubType>Code</SubType>
131 </Compile>
132 <Compile Include="Commands\ExportParticlesCommand.cs">
133 <SubType>Code</SubType>
134 </Compile>
135 <Compile Include="Commands\FindSimCommand.cs">
136 <SubType>Code</SubType>
137 </Compile>
138 <Compile Include="Commands\HelpCommand.cs">
139 <SubType>Code</SubType>
140 </Compile>
141 <Compile Include="Commands\ImportCommand.cs">
142 <SubType>Code</SubType>
143 </Compile>
144 <Compile Include="Commands\ImportOutfitCommand.cs">
145 <SubType>Code</SubType>
146 </Compile>
147 <Compile Include="Commands\LoadCommand.cs">
148 <SubType>Code</SubType>
149 </Compile>
150 <Compile Include="Commands\LoginCommand.cs">
151 <SubType>Code</SubType>
152 </Compile>
153 <Compile Include="Commands\LogoutCommand.cs">
154 <SubType>Code</SubType>
155 </Compile>
156 <Compile Include="Commands\MD5Command.cs">
157 <SubType>Code</SubType>
158 </Compile>
159 <Compile Include="Commands\PacketLogCommand.cs">
160 <SubType>Code</SubType>
161 </Compile>
162 <Compile Include="Commands\ParcelInfoCommand.cs">
163 <SubType>Code</SubType>
164 </Compile>
165 <Compile Include="Commands\PrimCountCommand.cs">
166 <SubType>Code</SubType>
167 </Compile>
168 <Compile Include="Commands\QuitCommand.cs">
169 <SubType>Code</SubType>
170 </Compile>
171 <Compile Include="Commands\RegionInfoCommand.cs">
172 <SubType>Code</SubType>
173 </Compile>
174 <Compile Include="Commands\SetMasterCommand.cs">
175 <SubType>Code</SubType>
176 </Compile>
177 <Compile Include="Commands\SetMasterKeyCommand.cs">
178 <SubType>Code</SubType>
179 </Compile>
180 <Compile Include="Commands\ShowEffectsCommand.cs">
181 <SubType>Code</SubType>
182 </Compile>
183 <Compile Include="Commands\StatsCommand.cs">
184 <SubType>Code</SubType>
185 </Compile>
186 <Compile Include="Commands\TouchCommand.cs">
187 <SubType>Code</SubType>
188 </Compile>
189 <Compile Include="Commands\TreeCommand.cs">
190 <SubType>Code</SubType>
191 </Compile>
192 <Compile Include="Commands\UptimeCommand.cs">
193 <SubType>Code</SubType>
194 </Compile>
195 <Compile Include="Commands\WhoCommand.cs">
196 <SubType>Code</SubType>
197 </Compile>
198 <Compile Include="Commands\Communication\EchoMasterCommand.cs">
199 <SubType>Code</SubType>
200 </Compile>
201 <Compile Include="Commands\Communication\IMCommand.cs">
202 <SubType>Code</SubType>
203 </Compile>
204 <Compile Include="Commands\Communication\SayCommand.cs">
205 <SubType>Code</SubType>
206 </Compile>
207 <Compile Include="Commands\Communication\ShoutCommand.cs">
208 <SubType>Code</SubType>
209 </Compile>
210 <Compile Include="Commands\Communication\WhisperCommand.cs">
211 <SubType>Code</SubType>
212 </Compile>
213 <Compile Include="Commands\Inventory\BalanceCommand.cs">
214 <SubType>Code</SubType>
215 </Compile>
216 <Compile Include="Commands\Inventory\DeleteFolderCommand.cs">
217 <SubType>Code</SubType>
218 </Compile>
219 <Compile Include="Commands\Inventory\GiveAllCommand.cs">
220 <SubType>Code</SubType>
221 </Compile>
222 <Compile Include="Commands\Inventory\InventoryCommand.cs">
223 <SubType>Code</SubType>
224 </Compile>
225 <Compile Include="Commands\Inventory\WearCommand.cs">
226 <SubType>Code</SubType>
227 </Compile>
228 <Compile Include="Commands\Movement\FollowCommand.cs">
229 <SubType>Code</SubType>
230 </Compile>
231 <Compile Include="Commands\Movement\GotoCommand.cs">
232 <SubType>Code</SubType>
233 </Compile>
234 <Compile Include="Commands\Movement\JumpCommand.cs">
235 <SubType>Code</SubType>
236 </Compile>
237 <Compile Include="Commands\Movement\LocationCommand.cs">
238 <SubType>Code</SubType>
239 </Compile>
240 <Compile Include="Commands\Movement\MoveToCommand.cs">
241 <SubType>Code</SubType>
242 </Compile>
243 <Compile Include="Commands\Movement\SitCommand.cs">
244 <SubType>Code</SubType>
245 </Compile>
246 <Compile Include="Commands\Movement\SitOnCommand.cs">
247 <SubType>Code</SubType>
248 </Compile>
249 <Compile Include="Commands\Movement\StandCommand.cs">
250 <SubType>Code</SubType>
251 </Compile>
252 <Compile Include="Properties\AssemblyInfo.cs">
253 <SubType>Code</SubType>
254 </Compile>
255 </ItemGroup>
256 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
257 <PropertyGroup>
258 <PreBuildEvent>
259 </PreBuildEvent>
260 <PostBuildEvent>
261 </PostBuildEvent>
262 </PropertyGroup>
263</Project>
diff --git a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 6ef93c2..02abc3e 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.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,8 +6,7 @@
6 <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{39BD9497-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,27 +55,26 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="System"> 61 <Reference Include="System" >
69 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System.Xml"> 65 <Reference Include="System.Xml" >
73 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data"> 69 <Reference Include="System.Data" >
77 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="libsecondlife.dll"> 73 <Reference Include="libsecondlife.dll" >
81 <HintPath>..\bin\libsecondlife.dll</HintPath> 74 <HintPath>..\bin\libsecondlife.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
84 <Reference Include="Db4objects.Db4o.dll"> 77 <Reference Include="Db4objects.Db4o.dll" >
85 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
86 <Private>False</Private> 79 <Private>False</Private>
87 </Reference> 80 </Reference>
@@ -91,7 +84,7 @@
91 <Name>OpenGrid.Framework.Data</Name> 84 <Name>OpenGrid.Framework.Data</Name>
92 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 85 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
93 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
94 <Private>False</Private> 87 <Private>False</Private>
95 </ProjectReference> 88 </ProjectReference>
96 </ItemGroup> 89 </ItemGroup>
97 <ItemGroup> 90 <ItemGroup>
@@ -101,7 +94,9 @@
101 <Compile Include="DB4oManager.cs"> 94 <Compile Include="DB4oManager.cs">
102 <SubType>Code</SubType> 95 <SubType>Code</SubType>
103 </Compile> 96 </Compile>
104 <Compile Include="DB4oUserData.cs" /> 97 <Compile Include="DB4oUserData.cs">
98 <SubType>Code</SubType>
99 </Compile>
105 <Compile Include="Properties\AssemblyInfo.cs"> 100 <Compile Include="Properties\AssemblyInfo.cs">
106 <SubType>Code</SubType> 101 <SubType>Code</SubType>
107 </Compile> 102 </Compile>
@@ -113,4 +108,4 @@
113 <PostBuildEvent> 108 <PostBuildEvent>
114 </PostBuildEvent> 109 </PostBuildEvent>
115 </PropertyGroup> 110 </PropertyGroup>
116</Project> \ No newline at end of file 111</Project>
diff --git a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index e64663d..201f7ba 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGrid.Framework.Data/OpenGrid.Framework.Data.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,8 +6,7 @@
6 <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{62CDF671-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGrid.Framework.Data</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGrid.Framework.Data</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,23 +55,22 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="System"> 61 <Reference Include="System" >
69 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System.Xml"> 65 <Reference Include="System.Xml" >
73 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data"> 69 <Reference Include="System.Data" >
77 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="libsecondlife.dll"> 73 <Reference Include="libsecondlife.dll" >
81 <HintPath>..\bin\libsecondlife.dll</HintPath> 74 <HintPath>..\bin\libsecondlife.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
@@ -91,7 +84,9 @@
91 <Compile Include="SimProfileData.cs"> 84 <Compile Include="SimProfileData.cs">
92 <SubType>Code</SubType> 85 <SubType>Code</SubType>
93 </Compile> 86 </Compile>
94 <Compile Include="UserData.cs" /> 87 <Compile Include="UserData.cs">
88 <SubType>Code</SubType>
89 </Compile>
95 <Compile Include="UserProfileData.cs"> 90 <Compile Include="UserProfileData.cs">
96 <SubType>Code</SubType> 91 <SubType>Code</SubType>
97 </Compile> 92 </Compile>
@@ -106,4 +101,4 @@
106 <PostBuildEvent> 101 <PostBuildEvent>
107 </PostBuildEvent> 102 </PostBuildEvent>
108 </PropertyGroup> 103 </PropertyGroup>
109</Project> \ No newline at end of file 104</Project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 1fd24b7..1589171 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -196,9 +196,11 @@ namespace OpenSim
196 GridServers.AssetServer.SetServerInfo((string)((RemoteGridBase)GridServers.GridServer).GridData["asset_url"], (string)((RemoteGridBase)GridServers.GridServer).GridData["asset_sendkey"]); 196 GridServers.AssetServer.SetServerInfo((string)((RemoteGridBase)GridServers.GridServer).GridData["asset_url"], (string)((RemoteGridBase)GridServers.GridServer).GridData["asset_sendkey"]);
197 197
198 // If we are being told to load a file, load it. 198 // If we are being told to load a file, load it.
199 if (((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]) != "") 199 string dataUri = (string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"];
200
201 if ( !String.IsNullOrEmpty( dataUri ) )
200 { 202 {
201 this.LocalWorld.m_datastore = ((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]); 203 this.LocalWorld.m_datastore = dataUri;
202 } 204 }
203 205
204 if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "") 206 if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "")