aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorlbsa712007-09-24 02:41:13 +0000
committerlbsa712007-09-24 02:41:13 +0000
commit5818958a9a6c5a10743928973172d255632af6de (patch)
tree16076d3c3dd65f303ba74ddbbdaa1ca3e3b6e67c /OpenSim/Region
parentlong-lost fixes to physics -- proper physical avatar management on crossings, TP (diff)
downloadopensim-SC_OLD-5818958a9a6c5a10743928973172d255632af6de.zip
opensim-SC_OLD-5818958a9a6c5a10743928973172d255632af6de.tar.gz
opensim-SC_OLD-5818958a9a6c5a10743928973172d255632af6de.tar.bz2
opensim-SC_OLD-5818958a9a6c5a10743928973172d255632af6de.tar.xz
*** CHANGED CONFIG BEHAVIOUR ***
* Changed really strange LocalSettings behaviour with enforcing hard-coded plugin names if none supplied * UserServices and InventoryPlugin will only load if supplied with filename
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs26
2 files changed, 12 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 161e73f..c28025b 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -79,8 +79,8 @@ namespace OpenSim
79 79
80 private bool standaloneAuthenticate = false; 80 private bool standaloneAuthenticate = false;
81 private string standaloneWelcomeMessage = null; 81 private string standaloneWelcomeMessage = null;
82 private string standaloneInventoryPlugin = ""; 82 private string standaloneInventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
83 private string standaloneUserPlugin = ""; 83 private string standaloneUserPlugin = "OpenSim.Framework.Data.DB4o.dll";
84 84
85 private string m_assetStorage = "db4o"; 85 private string m_assetStorage = "db4o";
86 86
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 1f54310..3031b8a 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,13 +44,13 @@ namespace OpenSim.Region.Communications.Local
44 public LocalUserServices UserServices; 44 public LocalUserServices UserServices;
45 public LocalLoginService LoginServices; 45 public LocalLoginService LoginServices;
46 public LocalInventoryService InvenServices; 46 public LocalInventoryService InvenServices;
47 47
48 protected LocalSettings m_settings; 48 protected LocalSettings m_settings;
49 49
50 protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) 50 protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
51 : base(serversInfo, httpServer, assetCache) 51 : base(serversInfo, httpServer, assetCache)
52 { 52 {
53 53
54 } 54 }
55 55
56 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings) 56 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings)
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Communications.Local
94 94
95 if (cmmdParams.Length < 2) 95 if (cmmdParams.Length < 2)
96 { 96 {
97 97
98 firstName = MainLog.Instance.CmdPrompt("First name", "Default"); 98 firstName = MainLog.Instance.CmdPrompt("First name", "Default");
99 lastName = MainLog.Instance.CmdPrompt("Last name", "User"); 99 lastName = MainLog.Instance.CmdPrompt("Last name", "User");
100 password = MainLog.Instance.PasswdPrompt("Password"); 100 password = MainLog.Instance.PasswdPrompt("Password");
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Communications.Local
126 { 126 {
127 return LLUUID.Zero; 127 return LLUUID.Zero;
128 } 128 }
129 else 129 else
130 { 130 {
131 this.InvenServices.CreateNewUserInventory(userProf.UUID); 131 this.InvenServices.CreateNewUserInventory(userProf.UUID);
132 Console.WriteLine("Created new inventory set for " + firstName + " " + lastName); 132 Console.WriteLine("Created new inventory set for " + firstName + " " + lastName);
@@ -136,23 +136,17 @@ namespace OpenSim.Region.Communications.Local
136 136
137 public class LocalSettings 137 public class LocalSettings
138 { 138 {
139 public string WelcomeMessage = ""; 139 public string WelcomeMessage;
140 public bool AccountAuthentication = false; 140 public bool AccountAuthentication = false;
141 public string InventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; 141 public string InventoryPlugin;
142 public string UserDatabasePlugin = "OpenSim.Framework.Data.DB4o.dll"; 142 public string UserDatabasePlugin;
143 143
144 public LocalSettings(string welcomeMessage, bool accountsAuthenticate, string inventoryPlugin, string userPlugin) 144 public LocalSettings(string welcomeMessage, bool accountsAuthenticate, string inventoryPlugin, string userPlugin)
145 { 145 {
146 WelcomeMessage = welcomeMessage; 146 WelcomeMessage = welcomeMessage;
147 AccountAuthentication = accountsAuthenticate; 147 AccountAuthentication = accountsAuthenticate;
148 if (inventoryPlugin != "") 148 InventoryPlugin = inventoryPlugin;
149 { 149 UserDatabasePlugin = userPlugin;
150 InventoryPlugin = inventoryPlugin;
151 }
152 if (userPlugin != "")
153 {
154 UserDatabasePlugin = userPlugin;
155 }
156 } 150 }
157 } 151 }
158 152