Merge branch 'master' into test-merge0418

author: Mic Bowman 2011-04-18 11:29:43 -0700
committer: Mic Bowman 2011-04-18 11:29:43 -0700
commit: 452ae375f0fdd62ba16fb170869ea470c6906cfe (patch)
tree: b5a7d364e509f2ff7f1b9086e2ba5658f4ee99ac /OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
parent: Remove the call to remove tokens from the parent. Under heavy load (diff)
parent: Mantis #5442: Add admin_save_heightmap (diff)
download: opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.zip
opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.gz
opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.bz2
opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.xz
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 1b3419d..51d1d59 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -195,6 +195,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
        public byte[] GetData(string id)
        {
+//            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Requesting data for asset {0}", id);
+            
            AssetBase asset = m_Cache.Get(id);
            if (asset != null)
author	Mic Bowman	2011-04-18 11:29:43 -0700
committer	Mic Bowman	2011-04-18 11:29:43 -0700
commit	452ae375f0fdd62ba16fb170869ea470c6906cfe (patch)
tree	b5a7d364e509f2ff7f1b9086e2ba5658f4ee99ac /OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
parent	Remove the call to remove tokens from the parent. Under heavy load (diff)
parent	Mantis #5442: Add admin_save_heightmap (diff)
download	opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.zip opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.gz opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.bz2 opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.xz

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index 1b3419d..51d1d59 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -195,6 +195,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
195		195
196	public byte[] GetData(string id)	196	public byte[] GetData(string id)
197	{	197	{
		198	// m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Requesting data for asset {0}", id);
		199
198	AssetBase asset = m_Cache.Get(id);	200	AssetBase asset = m_Cache.Get(id);
199		201
200	if (asset != null)	202	if (asset != null)