aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserConfig.cs
diff options
context:
space:
mode:
authorMW2007-12-01 18:49:17 +0000
committerMW2007-12-01 18:49:17 +0000
commit5df851761aa796cba70a3b6d8b36d119502c1de2 (patch)
tree4cab0f2d6ea32a6cfb280d74583d8ffce7331c26 /OpenSim/Framework/UserConfig.cs
parentAttempt to fix mantis issue # 65, seems like it is a race condition between t... (diff)
downloadopensim-SC-5df851761aa796cba70a3b6d8b36d119502c1de2.zip
opensim-SC-5df851761aa796cba70a3b6d8b36d119502c1de2.tar.gz
opensim-SC-5df851761aa796cba70a3b6d8b36d119502c1de2.tar.bz2
opensim-SC-5df851761aa796cba70a3b6d8b36d119502c1de2.tar.xz
Initial working Grid Inventory server. Only been tested on a very small grid, so likely to have problems on a larger grid with more people?
To use , both the user server and Inventory server need to be running this latest revision. (older regions should be able to still be used, just the user won't have inventory on them). Also and HERE IS THE BIG BREAK ISSUE, currently, so that the initial inventory details for a user are added to the inventory db , you need to recreate the accounts using the user server "create user" feature. It should be quite easy to manual populate the inventory database instead but I someone else will need to look into that) Also I've only tested using SQLite as the database provider, there is a Mysql inventory provider but I don't know if it works (SQLite is set as default, so you will need to change it in the inventory server config.xml)
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/UserConfig.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index d4ee62f..4c6b3b8 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -38,6 +38,8 @@ namespace OpenSim.Framework
38 public string GridSendKey = ""; 38 public string GridSendKey = "";
39 public string GridRecvKey = ""; 39 public string GridRecvKey = "";
40 40
41 public string InventoryUrl = "";
42
41 public string DatabaseProvider = ""; 43 public string DatabaseProvider = "";
42 44
43 public static uint DefaultHttpPort = 8002; 45 public static uint DefaultHttpPort = 8002;
@@ -68,6 +70,11 @@ namespace OpenSim.Framework
68 "Key to send to grid server", "null", false); 70 "Key to send to grid server", "null", false);
69 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 71 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
70 "Key to expect from grid server", "null", false); 72 "Key to expect from grid server", "null", false);
73
74 configMember.addConfigurationOption("default_inventory_server",
75 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
76 "Default Inventory Server URI",
77 "http://127.0.0.1:8004/", false);
71 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 78 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
72 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 79 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
73 80
@@ -95,6 +102,9 @@ namespace OpenSim.Framework
95 case "grid_recv_key": 102 case "grid_recv_key":
96 GridRecvKey = (string) configuration_result; 103 GridRecvKey = (string) configuration_result;
97 break; 104 break;
105 case "default_inventory_server":
106 InventoryUrl = (string)configuration_result;
107 break;
98 case "database_provider": 108 case "database_provider":
99 DatabaseProvider = (string) configuration_result; 109 DatabaseProvider = (string) configuration_result;
100 break; 110 break;