The new secure inventory server mode (in r5590) can now be disabled from OpenSim.ini. Default is to use the new mode.

1 files changed, 18 insertions, 4 deletions

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
             m_gridService = gridInterComms;
             m_interRegion = gridInterComms;
 
-            m_secureinventoryServices = new OGS1SecureInventoryService(serversInfo.InventoryURL);
-            OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL);
-            AddInventoryService(invService);
-            m_defaultInventoryHost = invService.Host;
+            if (serversInfo.secureInventoryServer)
+            {
+                OGS1SecureInventoryService invService = new OGS1SecureInventoryService(serversInfo.InventoryURL);
+                AddSecureInventoryService(invService);
+                m_defaultInventoryHost = invService.Host;
+            }
+            else
+            {
+                OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL);
+                AddInventoryService(invService);
+                m_defaultInventoryHost = invService.Host;
+            }
 
             m_userService = new OGS1UserServices(this);
             m_avatarService = (IAvatarService)m_userService;
@@ -55,5 +63,11 @@ namespace OpenSim.Region.Communications.OGS1
             OGS1InventoryService invService = new OGS1InventoryService(hostUrl);
             AddInventoryService(invService);
         }
+
+        public override void AddSecureInventoryService(string hostUrl)
+        {
+            OGS1SecureInventoryService invService = new OGS1SecureInventoryService(hostUrl);
+            AddSecureInventoryService(invService);
+        }
     }
 }