From 72159dc5a8dcad4bc5d1294b55cf5c10e9a12054 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 8 May 2007 14:16:01 +0000
Subject: * fixed dataUri null bug * ignored some files
---
ExportBot/ExportBot.csproj | 263 +++++++++++++++++++++
.../OpenGrid.Framework.Data.DB4o.csproj | 41 ++--
.../OpenGrid.Framework.Data.csproj | 37 ++-
OpenSim.RegionServer/OpenSimMain.cs | 6 +-
4 files changed, 301 insertions(+), 46 deletions(-)
create mode 100644 ExportBot/ExportBot.csproj
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 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {C4071317-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ ExportBot
+ JScript
+ Grid
+ IE50
+ false
+ Exe
+
+ ExportBot
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ System.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\bin\libsecondlife.dll
+ False
+
+
+ ..\bin\openjpegnet.dll
+ False
+
+
+ ..\bin\OpenSim.Framework.dll
+ False
+
+
+ ..\bin\OpenSim.Framework.Console.dll
+ False
+
+
+ ..\bin\OpenSim.Servers.dll
+ False
+
+
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
Local
8.0.50727
@@ -6,8 +6,7 @@
{39BD9497-0000-0000-0000-000000000000}
Debug
AnyCPU
-
-
+
OpenGrid.Framework.Data.DB4o
@@ -16,11 +15,9 @@
IE50
false
Library
-
-
+
OpenGrid.Framework.Data.DB4o
-
-
+
@@ -31,8 +28,7 @@
TRACE;DEBUG
-
-
+
True
4096
False
@@ -41,8 +37,7 @@
False
False
4
-
-
+
False
@@ -51,8 +46,7 @@
TRACE
-
-
+
False
4096
True
@@ -61,27 +55,26 @@
False
False
4
-
-
+
-
+
System.dll
False
-
+
System.Xml.dll
False
-
+
System.Data.dll
False
-
+
..\bin\libsecondlife.dll
False
-
+
..\bin\Db4objects.Db4o.dll
False
@@ -91,7 +84,7 @@
OpenGrid.Framework.Data
{62CDF671-0000-0000-0000-000000000000}
{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
+ False
@@ -101,7 +94,9 @@
Code
-
+
+ Code
+
Code
@@ -113,4 +108,4 @@
-
\ No newline at end of file
+
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 @@
-
+
Local
8.0.50727
@@ -6,8 +6,7 @@
{62CDF671-0000-0000-0000-000000000000}
Debug
AnyCPU
-
-
+
OpenGrid.Framework.Data
@@ -16,11 +15,9 @@
IE50
false
Library
-
-
+
OpenGrid.Framework.Data
-
-
+
@@ -31,8 +28,7 @@
TRACE;DEBUG
-
-
+
True
4096
False
@@ -41,8 +37,7 @@
False
False
4
-
-
+
False
@@ -51,8 +46,7 @@
TRACE
-
-
+
False
4096
True
@@ -61,23 +55,22 @@
False
False
4
-
-
+
-
+
System.dll
False
-
+
System.Xml.dll
False
-
+
System.Data.dll
False
-
+
..\bin\libsecondlife.dll
False
@@ -91,7 +84,9 @@
Code
-
+
+ Code
+
Code
@@ -106,4 +101,4 @@
-
\ No newline at end of file
+
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
GridServers.AssetServer.SetServerInfo((string)((RemoteGridBase)GridServers.GridServer).GridData["asset_url"], (string)((RemoteGridBase)GridServers.GridServer).GridData["asset_sendkey"]);
// If we are being told to load a file, load it.
- if (((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]) != "")
+ string dataUri = (string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"];
+
+ if ( !String.IsNullOrEmpty( dataUri ) )
{
- this.LocalWorld.m_datastore = ((string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"]);
+ this.LocalWorld.m_datastore = dataUri;
}
if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "")
--
cgit v1.1