aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/OpenSimMain.cs
diff options
context:
space:
mode:
authorlbsa712007-05-08 14:16:01 +0000
committerlbsa712007-05-08 14:16:01 +0000
commit72159dc5a8dcad4bc5d1294b55cf5c10e9a12054 (patch)
treefdd28935200bb8240196dc778b1122c5c1e5546d /OpenSim.RegionServer/OpenSimMain.cs
parent* ignored some more bin dirs (diff)
downloadopensim-SC_OLD-72159dc5a8dcad4bc5d1294b55cf5c10e9a12054.zip
opensim-SC_OLD-72159dc5a8dcad4bc5d1294b55cf5c10e9a12054.tar.gz
opensim-SC_OLD-72159dc5a8dcad4bc5d1294b55cf5c10e9a12054.tar.bz2
opensim-SC_OLD-72159dc5a8dcad4bc5d1294b55cf5c10e9a12054.tar.xz
* fixed dataUri null bug
* ignored some files
Diffstat (limited to 'OpenSim.RegionServer/OpenSimMain.cs')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs6
1 files changed, 4 insertions, 2 deletions
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() != "")