aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Data/SQLite
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs9
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs5
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs4
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs9
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs7
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs10
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs9
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs9
12 files changed, 15 insertions, 57 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index d28956f..f6f62a7 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using Mono.Data.SqliteClient; 32using Mono.Data.SqliteClient;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 46d29a3..3fb33c2 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -28,15 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO;
32using System.Reflection; 31using System.Reflection;
33using System.Threading;
34using OpenMetaverse;
35using Mono.Data.SqliteClient;
36using log4net; 32using log4net;
33using Mono.Data.SqliteClient;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40 37
41namespace OpenSim.Data.SQLite 38namespace OpenSim.Data.SQLite
42{ 39{
@@ -109,7 +106,7 @@ namespace OpenSim.Data.SQLite
109 else 106 else
110 m_FieldMap[name].SetValue(es, false); 107 m_FieldMap[name].SetValue(es, false);
111 } 108 }
112 else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) 109 else if (m_FieldMap[name].GetValue(es) is UUID)
113 { 110 {
114 UUID uuid = UUID.Zero; 111 UUID uuid = UUID.Zero;
115 112
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 5b0455d..6c7c58c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -29,10 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using System.Security.Cryptography;
33using System.Text;
34using OpenMetaverse;
35using log4net; 32using log4net;
33using OpenMetaverse;
36using OpenSim.Framework; 34using OpenSim.Framework;
37 35
38namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index c497396..6391c6d 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index a936ec1..4d45d08 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SQLite; 31using System.Data.SQLite;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 89308db..7ec4ceb 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -28,13 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Drawing;
31using System.IO; 32using System.IO;
32using System.Reflection; 33using System.Reflection;
33using System.Threading;
34using System.Drawing;
35using OpenMetaverse;
36using log4net; 34using log4net;
37using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
36using OpenMetaverse;
38using OpenSim.Framework; 37using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 1c36453..788a9ea 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
@@ -645,7 +645,7 @@ namespace OpenSim.Data.SQLite
645 try { 645 try {
646 aa = aplist[user]; 646 aa = aplist[user];
647 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString()); 647 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
648 } catch (System.Collections.Generic.KeyNotFoundException) { 648 } catch (KeyNotFoundException) {
649 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString()); 649 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
650 } 650 }
651 return aa; 651 return aa;
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index 0de965d..60aa1f3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -25,16 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 31efcc3..774cca1 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -25,16 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 07b0dab..70903c3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -25,17 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
41{ 33{
@@ -61,7 +53,7 @@ namespace OpenSim.Data.SQLite.Tests
61 public void Cleanup() 53 public void Cleanup()
62 { 54 {
63 db.Dispose(); 55 db.Dispose();
64 System.IO.File.Delete(file); 56 File.Delete(file);
65 } 57 }
66 } 58 }
67} 59}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 86a1192..652a53a 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -25,16 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 0415219..6f8d89d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -25,16 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.IO; 28using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file