ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* fixed dataUri null bug

Browse Source 
* ignored some files
This commit is contained in:
lbsa71
2007-05-08 14:16:01 +00:00
parent 0e7b0711c7
commit 72159dc5a8
4 changed files with 301 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim.RegionServer/OpenSimMain.cs
View File

@@ -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() != "")