diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Data/SQLite/SQLiteAssetData.cs | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index b09c1c9..72af7a0 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
| @@ -183,7 +183,7 @@ namespace OpenSim.Data.SQLite | |||
| 183 | int assetLength = (asset.Data != null) ? asset.Data.Length : 0; | 183 | int assetLength = (asset.Data != null) ? asset.Data.Length : 0; |
| 184 | 184 | ||
| 185 | m_log.Info("[ASSET DB]: " + | 185 | m_log.Info("[ASSET DB]: " + |
| 186 | string.Format("Loaded {6} {5} Asset: [{0}][{3}] \"{1}\":{2} ({7} bytes)", | 186 | string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)", |
| 187 | asset.FullID, asset.Name, asset.Description, asset.Type, | 187 | asset.FullID, asset.Name, asset.Description, asset.Type, |
| 188 | temporary, local, assetLength)); | 188 | temporary, local, assetLength)); |
| 189 | } | 189 | } |