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, 3 insertions, 1 deletions

diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 399a365..43ec11e 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework
         public string GridURL = String.Empty;
         public uint HttpListenerPort = DefaultHttpListenerPort;
         public string InventoryURL = String.Empty;
+        public bool secureInventoryServer = false;
         public bool isSandbox;
         private uint? m_defaultHomeLocX;
         private uint? m_defaultHomeLocY;
@@ -93,6 +94,7 @@ namespace OpenSim.Framework
             InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
                                                                "http://127.0.0.1:" +
                                                                InventoryConfig.DefaultHttpPort.ToString());
+            secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
         }
     }
-}
\ No newline at end of file
+}