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

---
 OpenSim.RegionServer/OpenSimMain.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim.RegionServer')

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