OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Can now set the plugins for standalone mode's Inventory database (default sqlite) and for its user database (default DB4o). Currently changing the user plugin to MySql should work (if you have MySql setup (should be same as for grid mode). There is also a MySql provider for the inventory but not 100% certain if that is finished and functional (will need to check with Adam on that).

afrisby
MW 2007-08-16 11:24:40 +00:00
parent 94af938742
commit b6c48c53b2
4 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Communications/Cache/AssetTransactions.cs
View File

@ -262,7 +262,7 @@ namespace OpenSim.Framework.Communications.Caches
{ {
DoCreateItem(); DoCreateItem();
} }
Console.WriteLine("upload complete "+ this.TransactionID); // Console.WriteLine("upload complete "+ this.TransactionID);
//SaveAssetToFile("testudpupload" + Util.RandomClass.Next(1, 1000) + ".dat", this.Asset.Data); //SaveAssetToFile("testudpupload" + Util.RandomClass.Next(1, 1000) + ".dat", this.Asset.Data);
} }
private void SaveAssetToFile(string filename, byte[] data) private void SaveAssetToFile(string filename, byte[] data)
@ -319,6 +319,11 @@ namespace OpenSim.Framework.Communications.Caches
ourClient.SendInventoryItemUpdate(item); ourClient.SendInventoryItemUpdate(item);
} }
} }
public void UpdateInventoryItem(LLUUID itemID)
{
}
} }
public class NoteCardCapsUpdate public class NoteCardCapsUpdate

13
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -74,7 +74,9 @@ namespace OpenSim
private string m_logFilename = ("region-console.log"); private string m_logFilename = ("region-console.log");
private bool standaloneAuthenticate = false; private bool standaloneAuthenticate = false;
private string welcomeMessage = null; private string standaloneWelcomeMessage = null;
private string standaloneInventoryPlugin = "";
private string standaloneUserPlugin = "";
public ConsoleCommand CreateAccount = null; public ConsoleCommand CreateAccount = null;
@ -109,8 +111,10 @@ namespace OpenSim
m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", ""); m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", "");
standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false); standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false);
welcomeMessage = configSource.Configs["Startup"].GetString("standalone_welcome", "Welcome to OpenSim"); standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll");
} }
/// <summary> /// <summary>
@ -130,7 +134,8 @@ namespace OpenSim
if (m_sandbox) if (m_sandbox)
{ {
CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate, welcomeMessage); CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin, standaloneUserPlugin);
CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings);
m_commsManager = localComms; m_commsManager = localComms;
if(standaloneAuthenticate) if(standaloneAuthenticate)
{ {

33
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@ -44,16 +44,19 @@ namespace OpenSim.Region.Communications.Local
public LocalLoginService LoginServices; public LocalLoginService LoginServices;
public LocalInventoryService InvenServices; public LocalInventoryService InvenServices;
// public CAPSService CapsServices; // public CAPSService CapsServices;
private LocalSettings m_settings;
public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage ) public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings )
: base(serversInfo, httpServer, assetCache) : base(serversInfo, httpServer, assetCache)
{ {
m_settings = settings;
InvenServices = new LocalInventoryService(); InvenServices = new LocalInventoryService();
InvenServices.AddPlugin("OpenSim.Framework.Data.SQLite.dll"); InvenServices.AddPlugin(m_settings.InventoryPlugin);
InventoryServer = InvenServices; InventoryServer = InvenServices;
UserServices = new LocalUserServices(this, serversInfo); UserServices = new LocalUserServices(this, serversInfo);
UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll"); UserServices.AddPlugin(m_settings.UserDatabasePlugin);
UserServer = UserServices; UserServer = UserServices;
InstanceServices = new LocalBackEndServices(); InstanceServices = new LocalBackEndServices();
@ -62,7 +65,7 @@ namespace OpenSim.Region.Communications.Local
//CapsServices = new CAPSService(httpServer); //CapsServices = new CAPSService(httpServer);
LoginServices = new LocalLoginService(UserServices, welcomeMessage, this, serversInfo, accountsAuthenticate); LoginServices = new LocalLoginService(UserServices, m_settings.WelcomeMessage, this, serversInfo, m_settings.AccountAuthentication);
httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod); httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod);
} }
@ -101,5 +104,27 @@ namespace OpenSim.Region.Communications.Local
} }
} }
public class LocalSettings
{
public string WelcomeMessage = "";
public bool AccountAuthentication = false;
public string InventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
public string UserDatabasePlugin = "OpenSim.Framework.Data.DB4o.dll";
public LocalSettings(string welcomeMessage, bool accountsAuthenticate, string inventoryPlugin, string userPlugin)
{
WelcomeMessage = welcomeMessage;
AccountAuthentication = accountsAuthenticate;
if (inventoryPlugin != "")
{
InventoryPlugin = inventoryPlugin;
}
if (userPlugin != "")
{
UserDatabasePlugin = userPlugin;
}
}
}
} }
} }

3
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -47,7 +47,8 @@ namespace SimpleApp
{ {
base.StartUp(); base.StartUp();
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, false, ""); CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings("", false, "", "");
m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings);
m_log.Notice(m_log.LineInfo); m_log.Notice(m_log.LineInfo);