Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

author: Melanie 2009-10-02 00:45:43 +0100
committer: Melanie 2009-10-02 00:45:43 +0100
commit: 4a1076128c2f61af7881aaf817251d10948b87a0 (patch)
tree: fd01d419b14ad7a5c2da976970699bc2adfdcbf9 /OpenSim/Data
parent: Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff)
parent: Added messages to assertions in the failing tests, so that we know which ones... (diff)
download: opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.zip
opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.tar.gz
opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.tar.bz2
opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 3831467..49275cb 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
            //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
            if (ExistsAsset(asset.FullID))
            {
-                LogAssetLoad(asset);
+                //LogAssetLoad(asset);
                lock (this)
                {
@@ -173,7 +173,7 @@ namespace OpenSim.Data.SQLite
            int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
-            m_log.Info("[ASSET DB]: " +
+            m_log.Debug("[ASSET DB]: " +
                                     string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",
                                                   asset.FullID, asset.Name, asset.Description, asset.Type,
                                                   temporary, local, assetLength));
author	Melanie	2009-10-02 00:45:43 +0100
committer	Melanie	2009-10-02 00:45:43 +0100
commit	4a1076128c2f61af7881aaf817251d10948b87a0 (patch)
tree	fd01d419b14ad7a5c2da976970699bc2adfdcbf9 /OpenSim/Data
parent	Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff)
parent	Added messages to assertions in the failing tests, so that we know which ones... (diff)
download	opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.zip opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.tar.gz opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.tar.bz2 opensim-SC_OLD-4a1076128c2f61af7881aaf817251d10948b87a0.tar.xz

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 3831467..49275cb 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Data.SQLite
124	//m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());	124	//m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
125	if (ExistsAsset(asset.FullID))	125	if (ExistsAsset(asset.FullID))
126	{	126	{
127	LogAssetLoad(asset);	127	//LogAssetLoad(asset);
128		128
129	lock (this)	129	lock (this)
130	{	130	{
@@ -173,7 +173,7 @@ namespace OpenSim.Data.SQLite
173		173
174	int assetLength = (asset.Data != null) ? asset.Data.Length : 0;	174	int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
175		175
176	m_log.Info("[ASSET DB]: " +	176	m_log.Debug("[ASSET DB]: " +
177	string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",	177	string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",
178	asset.FullID, asset.Name, asset.Description, asset.Type,	178	asset.FullID, asset.Name, asset.Description, asset.Type,
179	temporary, local, assetLength));	179	temporary, local, assetLength));