diff options
author | Diva Canto | 2009-08-18 22:17:47 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-18 22:17:47 -0700 |
commit | 124f66bfc25984a01491b8447fa97bea2633281c (patch) | |
tree | 9f6ba47c216457b39a2e5c7bb921e41afa71d795 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory | |
parent | Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides user... (diff) | |
download | opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.zip opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.gz opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.bz2 opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.xz |
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index dd451ef..492598e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -483,12 +483,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
483 | string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI); | 483 | string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI); |
484 | string uri = m_LocalGridInventoryURI.TrimEnd('/'); | 484 | string uri = m_LocalGridInventoryURI.TrimEnd('/'); |
485 | 485 | ||
486 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, comparing {0} to {1}.", userInventoryServerURI, uri); | ||
487 | |||
488 | if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) | 486 | if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) |
489 | { | 487 | { |
490 | return true; | 488 | return true; |
491 | } | 489 | } |
490 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: user is foreign({0} - {1})", userInventoryServerURI, uri); | ||
492 | return false; | 491 | return false; |
493 | } | 492 | } |
494 | 493 | ||