aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteAssetData.cs
diff options
context:
space:
mode:
authorMelanie2010-06-07 05:23:52 +0100
committerMelanie2010-06-07 05:23:52 +0100
commitcc2622660bad93ef46844476e434b6640a3a3643 (patch)
treeaa0b0f36bcbfb9bd44fe396e1cd98f8de26f2255 /OpenSim/Data/SQLite/SQLiteAssetData.cs
parentGosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks. (diff)
parentRevert "commit code which stops full updates being fired multiple times when ... (diff)
downloadopensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.zip
opensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.tar.gz
opensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.tar.bz2
opensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.tar.xz
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index c52f60b..373c903 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -30,7 +30,7 @@ using System.Data;
30using System.Reflection; 30using System.Reflection;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using log4net; 32using log4net;
33using Mono.Data.SqliteClient; 33using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
@@ -339,4 +339,4 @@ namespace OpenSim.Data.SQLite
339 339
340 #endregion 340 #endregion
341 } 341 }
342} \ No newline at end of file 342}