*Fixed UserServer and OpenSim so now they start without crashing.
parent
0232f01a58
commit
440bb4a358
|
@ -48,7 +48,7 @@ namespace OpenSim.Grid.UserServer
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class OpenUser_Main : conscmd_callback
|
public class OpenUser_Main : conscmd_callback
|
||||||
{
|
{
|
||||||
private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
|
private string ConfigDll = "OpenSim.Grid.UserServer.Config.dll";
|
||||||
private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
|
private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
|
||||||
private UserConfig Cfg;
|
private UserConfig Cfg;
|
||||||
protected IGenericConfig localXMLConfig;
|
protected IGenericConfig localXMLConfig;
|
||||||
|
|
|
@ -154,7 +154,7 @@ namespace OpenSim
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
|
AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
|
||||||
InventoryCache = new InventoryCache();
|
InventoryCache = new InventoryCache();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
@ -169,7 +169,7 @@ namespace OpenSim
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
|
AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
|
||||||
InventoryCache = new InventoryCache();
|
InventoryCache = new InventoryCache();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
|
|
@ -2,7 +2,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using OpenSim;
|
using OpenSim;
|
||||||
using OpenSim.GridInterfaces.Local;
|
using OpenSim.Region.GridInterfaces.Local;
|
||||||
using OpenSim.Framework.Interfaces;
|
using OpenSim.Framework.Interfaces;
|
||||||
using OpenSim.Framework.Types;
|
using OpenSim.Framework.Types;
|
||||||
using OpenSim.Framework.Console;
|
using OpenSim.Framework.Console;
|
||||||
|
|
|
@ -38,7 +38,7 @@ using libsecondlife;
|
||||||
using Db4objects.Db4o;
|
using Db4objects.Db4o;
|
||||||
using Db4objects.Db4o.Query;
|
using Db4objects.Db4o.Query;
|
||||||
|
|
||||||
namespace OpenSim.GridInterfaces.Local
|
namespace OpenSim.Region.GridInterfaces.Local
|
||||||
{
|
{
|
||||||
public class LocalAssetPlugin : IAssetPlugin
|
public class LocalAssetPlugin : IAssetPlugin
|
||||||
{
|
{
|
||||||
|
|
|
@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
|
||||||
using OpenSim.Framework.Types;
|
using OpenSim.Framework.Types;
|
||||||
using OpenSim.Framework.Utilities;
|
using OpenSim.Framework.Utilities;
|
||||||
|
|
||||||
namespace OpenSim.GridInterfaces.Remote
|
namespace OpenSim.Region.GridInterfaces.Remote
|
||||||
{
|
{
|
||||||
public class RemoteAssetServer : IAssetServer
|
public class RemoteAssetServer : IAssetServer
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue