aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJohan Berntsson2008-07-23 09:46:04 +0000
committerJohan Berntsson2008-07-23 09:46:04 +0000
commitce4bcb50655e69277eac64a6d3ab520d669e6b70 (patch)
tree55391a649d22a534260553dabf47791f4bc650b0 /OpenSim/Region
parentFix issue 1760. If the inventory item is not found, llSay() and throw an exce... (diff)
downloadopensim-SC_OLD-ce4bcb50655e69277eac64a6d3ab520d669e6b70.zip
opensim-SC_OLD-ce4bcb50655e69277eac64a6d3ab520d669e6b70.tar.gz
opensim-SC_OLD-ce4bcb50655e69277eac64a6d3ab520d669e6b70.tar.bz2
opensim-SC_OLD-ce4bcb50655e69277eac64a6d3ab520d669e6b70.tar.xz
The new secure inventory server mode (in r5590) can now be disabled from OpenSim.ini. Default is to use the new mode.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs22
2 files changed, 19 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 05e4f46..6889a61 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -254,6 +254,7 @@ namespace OpenSim
254 config.Set("user_recv_key", "null"); 254 config.Set("user_recv_key", "null");
255 config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()); 255 config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString());
256 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); 256 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
257 config.Set("secure_inventory_server", "true");
257 } 258 }
258 259
259 if (DefaultConfig.Configs["RemoteAdmin"] == null) 260 if (DefaultConfig.Configs["RemoteAdmin"] == null)
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index a6ea128..1926e79 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -41,10 +41,18 @@ namespace OpenSim.Region.Communications.OGS1
41 m_gridService = gridInterComms; 41 m_gridService = gridInterComms;
42 m_interRegion = gridInterComms; 42 m_interRegion = gridInterComms;
43 43
44 m_secureinventoryServices = new OGS1SecureInventoryService(serversInfo.InventoryURL); 44 if (serversInfo.secureInventoryServer)
45 OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL); 45 {
46 AddInventoryService(invService); 46 OGS1SecureInventoryService invService = new OGS1SecureInventoryService(serversInfo.InventoryURL);
47 m_defaultInventoryHost = invService.Host; 47 AddSecureInventoryService(invService);
48 m_defaultInventoryHost = invService.Host;
49 }
50 else
51 {
52 OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL);
53 AddInventoryService(invService);
54 m_defaultInventoryHost = invService.Host;
55 }
48 56
49 m_userService = new OGS1UserServices(this); 57 m_userService = new OGS1UserServices(this);
50 m_avatarService = (IAvatarService)m_userService; 58 m_avatarService = (IAvatarService)m_userService;
@@ -55,5 +63,11 @@ namespace OpenSim.Region.Communications.OGS1
55 OGS1InventoryService invService = new OGS1InventoryService(hostUrl); 63 OGS1InventoryService invService = new OGS1InventoryService(hostUrl);
56 AddInventoryService(invService); 64 AddInventoryService(invService);
57 } 65 }
66
67 public override void AddSecureInventoryService(string hostUrl)
68 {
69 OGS1SecureInventoryService invService = new OGS1SecureInventoryService(hostUrl);
70 AddSecureInventoryService(invService);
71 }
58 } 72 }
59} 73}