aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs7
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs13
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs33
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs3
4 files changed, 46 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index cea6e6e..7f52739 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -262,7 +262,7 @@ namespace OpenSim.Framework.Communications.Caches
262 { 262 {
263 DoCreateItem(); 263 DoCreateItem();
264 } 264 }
265 Console.WriteLine("upload complete "+ this.TransactionID); 265 // Console.WriteLine("upload complete "+ this.TransactionID);
266 //SaveAssetToFile("testudpupload" + Util.RandomClass.Next(1, 1000) + ".dat", this.Asset.Data); 266 //SaveAssetToFile("testudpupload" + Util.RandomClass.Next(1, 1000) + ".dat", this.Asset.Data);
267 } 267 }
268 private void SaveAssetToFile(string filename, byte[] data) 268 private void SaveAssetToFile(string filename, byte[] data)
@@ -319,6 +319,11 @@ namespace OpenSim.Framework.Communications.Caches
319 ourClient.SendInventoryItemUpdate(item); 319 ourClient.SendInventoryItemUpdate(item);
320 } 320 }
321 } 321 }
322
323 public void UpdateInventoryItem(LLUUID itemID)
324 {
325
326 }
322 } 327 }
323 328
324 public class NoteCardCapsUpdate 329 public class NoteCardCapsUpdate
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 2ca3f46..0114cc6 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -74,7 +74,9 @@ namespace OpenSim
74 private string m_logFilename = ("region-console.log"); 74 private string m_logFilename = ("region-console.log");
75 75
76 private bool standaloneAuthenticate = false; 76 private bool standaloneAuthenticate = false;
77 private string welcomeMessage = null; 77 private string standaloneWelcomeMessage = null;
78 private string standaloneInventoryPlugin = "";
79 private string standaloneUserPlugin = "";
78 80
79 public ConsoleCommand CreateAccount = null; 81 public ConsoleCommand CreateAccount = null;
80 82
@@ -109,8 +111,10 @@ namespace OpenSim
109 111
110 m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", ""); 112 m_startupCommandsFile = configSource.Configs["Startup"].GetString("startup_console_commands_file", "");
111 113
112 standaloneAuthenticate = configSource.Configs["Startup"].GetBoolean("standalone_authenticate", false); 114 standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false);
113 welcomeMessage = configSource.Configs["Startup"].GetString("standalone_welcome", "Welcome to OpenSim"); 115 standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
116 standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
117 standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll");
114 } 118 }
115 119
116 /// <summary> 120 /// <summary>
@@ -130,7 +134,8 @@ namespace OpenSim
130 134
131 if (m_sandbox) 135 if (m_sandbox)
132 { 136 {
133 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, standaloneAuthenticate, welcomeMessage); 137 CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin, standaloneUserPlugin);
138 CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings);
134 m_commsManager = localComms; 139 m_commsManager = localComms;
135 if(standaloneAuthenticate) 140 if(standaloneAuthenticate)
136 { 141 {
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 9ff9133..66779a2 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,16 +44,19 @@ namespace OpenSim.Region.Communications.Local
44 public LocalLoginService LoginServices; 44 public LocalLoginService LoginServices;
45 public LocalInventoryService InvenServices; 45 public LocalInventoryService InvenServices;
46 // public CAPSService CapsServices; 46 // public CAPSService CapsServices;
47 private LocalSettings m_settings;
47 48
48 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, bool accountsAuthenticate, string welcomeMessage ) 49 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings )
49 : base(serversInfo, httpServer, assetCache) 50 : base(serversInfo, httpServer, assetCache)
50 { 51 {
52 m_settings = settings;
53
51 InvenServices = new LocalInventoryService(); 54 InvenServices = new LocalInventoryService();
52 InvenServices.AddPlugin("OpenSim.Framework.Data.SQLite.dll"); 55 InvenServices.AddPlugin(m_settings.InventoryPlugin);
53 InventoryServer = InvenServices; 56 InventoryServer = InvenServices;
54 57
55 UserServices = new LocalUserServices(this, serversInfo); 58 UserServices = new LocalUserServices(this, serversInfo);
56 UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll"); 59 UserServices.AddPlugin(m_settings.UserDatabasePlugin);
57 UserServer = UserServices; 60 UserServer = UserServices;
58 61
59 InstanceServices = new LocalBackEndServices(); 62 InstanceServices = new LocalBackEndServices();
@@ -62,7 +65,7 @@ namespace OpenSim.Region.Communications.Local
62 65
63 //CapsServices = new CAPSService(httpServer); 66 //CapsServices = new CAPSService(httpServer);
64 67
65 LoginServices = new LocalLoginService(UserServices, welcomeMessage, this, serversInfo, accountsAuthenticate); 68 LoginServices = new LocalLoginService(UserServices, m_settings.WelcomeMessage, this, serversInfo, m_settings.AccountAuthentication);
66 httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod); 69 httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod);
67 } 70 }
68 71
@@ -101,5 +104,27 @@ namespace OpenSim.Region.Communications.Local
101 } 104 }
102 } 105 }
103 106
107 public class LocalSettings
108 {
109 public string WelcomeMessage = "";
110 public bool AccountAuthentication = false;
111 public string InventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
112 public string UserDatabasePlugin = "OpenSim.Framework.Data.DB4o.dll";
113
114 public LocalSettings(string welcomeMessage, bool accountsAuthenticate, string inventoryPlugin, string userPlugin)
115 {
116 WelcomeMessage = welcomeMessage;
117 AccountAuthentication = accountsAuthenticate;
118 if (inventoryPlugin != "")
119 {
120 InventoryPlugin = inventoryPlugin;
121 }
122 if (userPlugin != "")
123 {
124 UserDatabasePlugin = userPlugin;
125 }
126 }
127 }
128
104 } 129 }
105} 130}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index f064eaa..64fe975 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -47,7 +47,8 @@ namespace SimpleApp
47 { 47 {
48 base.StartUp(); 48 base.StartUp();
49 49
50 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, false, ""); 50 CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings("", false, "", "");
51 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings);
51 52
52 m_log.Notice(m_log.LineInfo); 53 m_log.Notice(m_log.LineInfo);
53 54