diff options
author | Johan Berntsson | 2008-07-23 06:59:02 +0000 |
---|---|---|
committer | Johan Berntsson | 2008-07-23 06:59:02 +0000 |
commit | 344c9caeb671f3d9dab80f05d18a7dc9f3075bc1 (patch) | |
tree | 2c4d9fdd3d63384f009307f63eb6e0646e054593 /OpenSim/Region | |
parent | Enable LSL <-> C# source location mapping when reporing compiler errors to th... (diff) | |
download | opensim-SC_OLD-344c9caeb671f3d9dab80f05d18a7dc9f3075bc1.zip opensim-SC_OLD-344c9caeb671f3d9dab80f05d18a7dc9f3075bc1.tar.gz opensim-SC_OLD-344c9caeb671f3d9dab80f05d18a7dc9f3075bc1.tar.bz2 opensim-SC_OLD-344c9caeb671f3d9dab80f05d18a7dc9f3075bc1.tar.xz |
thanks lulurun for a security patch that blocks unathorized access to the inventory server (see http://opensimulator.org/wiki/Security_vulnerability_brought_by_non-check_inventory_service)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index f2e76f2..a6ea128 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |||
@@ -41,6 +41,7 @@ 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 | OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL); | 45 | OGS1InventoryService invService = new OGS1InventoryService(serversInfo.InventoryURL); |
45 | AddInventoryService(invService); | 46 | AddInventoryService(invService); |
46 | m_defaultInventoryHost = invService.Host; | 47 | m_defaultInventoryHost = invService.Host; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 6bf552c..ae5a3c7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2019,7 +2019,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2019 | { | 2019 | { |
2020 | m_log.Info("[REGION]: Add New Scene Presence"); | 2020 | m_log.Info("[REGION]: Add New Scene Presence"); |
2021 | 2021 | ||
2022 | CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); | 2022 | //CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); |
2023 | CommsManager.UserProfileCacheService.AddNewUser(client); | ||
2023 | 2024 | ||
2024 | CreateAndAddScenePresence(client, child); | 2025 | CreateAndAddScenePresence(client, child); |
2025 | } | 2026 | } |