ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Johan Berntsson
2008-07-23 09:46:04 +00:00
parent 003487631d
commit ce4bcb5065
6 changed files with 136 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -254,6 +254,7 @@ namespace OpenSim
config.Set("user_recv_key", "null");
config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString());
config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
config.Set("secure_inventory_server", "true");
}
if (DefaultConfig.Configs["RemoteAdmin"] == null)

22
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
View File

@@ -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);
}
}
}