aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
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/Application/OpenSimBase.cs
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 '')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
1 files changed, 1 insertions, 0 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)