aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/InventoryConfig.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/InventoryConfig.cs')
-rw-r--r--OpenSim/Framework/InventoryConfig.cs24
1 files changed, 23 insertions, 1 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index ef8a28a..90e4482 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -41,8 +41,11 @@ namespace OpenSim.Framework
41 public string DatabaseProvider = String.Empty; 41 public string DatabaseProvider = String.Empty;
42 public string DefaultStartupMsg = String.Empty; 42 public string DefaultStartupMsg = String.Empty;
43 public uint HttpPort = DefaultHttpPort; 43 public uint HttpPort = DefaultHttpPort;
44 public string InventoryServerURL = String.Empty;
44 public string UserServerURL = String.Empty; 45 public string UserServerURL = String.Empty;
46 public string AssetServerURL = String.Empty;
45 public bool SessionLookUp = true; 47 public bool SessionLookUp = true;
48 public bool RegionAccessToAgentsInventory = true;
46 49
47 public InventoryConfig(string description, string filename) 50 public InventoryConfig(string description, string filename)
48 { 51 {
@@ -53,10 +56,18 @@ namespace OpenSim.Framework
53 56
54 public void loadConfigurationOptions() 57 public void loadConfigurationOptions()
55 { 58 {
59 configMember.addConfigurationOption("default_inventory_server",
60 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
61 "Default Inventory Server URI (this server's external name)",
62 "http://127.0.0.1:8004", false);
56 configMember.addConfigurationOption("default_user_server", 63 configMember.addConfigurationOption("default_user_server",
57 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 64 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
58 "Default User Server URI", 65 "Default User Server URI",
59 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false); 66 "http://127.0.0.1:8002", false);
67 configMember.addConfigurationOption("default_asset_server",
68 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
69 "Default Asset Server URI",
70 "http://127.0.0.1:8003", false);
60 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 71 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
61 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 72 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
62 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 73 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -65,15 +76,23 @@ namespace OpenSim.Framework
65 "Http Listener port", DefaultHttpPort.ToString(), false); 76 "Http Listener port", DefaultHttpPort.ToString(), false);
66 configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 77 configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
67 "Enable session lookup security", "False", false); 78 "Enable session lookup security", "False", false);
79 configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
80 "Allow direct region access to users inventories? (Keep True if you don't know what this is about)", "True", false);
68 } 81 }
69 82
70 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 83 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
71 { 84 {
72 switch (configuration_key) 85 switch (configuration_key)
73 { 86 {
87 case "default_inventory_server":
88 InventoryServerURL = (string)configuration_result;
89 break;
74 case "default_user_server": 90 case "default_user_server":
75 UserServerURL = (string) configuration_result; 91 UserServerURL = (string) configuration_result;
76 break; 92 break;
93 case "default_asset_server":
94 AssetServerURL = (string)configuration_result;
95 break;
77 case "database_provider": 96 case "database_provider":
78 DatabaseProvider = (string) configuration_result; 97 DatabaseProvider = (string) configuration_result;
79 break; 98 break;
@@ -86,6 +105,9 @@ namespace OpenSim.Framework
86 case "session_lookup": 105 case "session_lookup":
87 SessionLookUp = (bool)configuration_result; 106 SessionLookUp = (bool)configuration_result;
88 break; 107 break;
108 case "region_access":
109 RegionAccessToAgentsInventory = (bool)configuration_result;
110 break;
89 } 111 }
90 112
91 return true; 113 return true;