aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorMelanie2010-07-11 13:32:10 +0100
committerMelanie2010-07-11 13:32:10 +0100
commit922e874653e81ae9b72da210ecfe1d2eb5efa9c6 (patch)
tree25ac2c896c952ca7298cecb700b61f7301439216 /OpenSim/Data/SQLite
parentFix the synchronousrestformsrequester so it will successfully handle a respon... (diff)
parentRemove localID from script controls data. It won't transfer to another (diff)
downloadopensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.zip
opensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.gz
opensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.bz2
opensim-SC_OLD-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 9dd4a2e..fcf041e 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -328,7 +328,7 @@ namespace OpenSim.Data.SQLite
328 328
329 public EstateSettings LoadEstateSettings(int estateID) 329 public EstateSettings LoadEstateSettings(int estateID)
330 { 330 {
331 string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID :EstateID"; 331 string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID = :EstateID";
332 332
333 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 333 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
334 334
@@ -342,7 +342,7 @@ namespace OpenSim.Data.SQLite
342 { 342 {
343 List<int> result = new List<int>(); 343 List<int> result = new List<int>();
344 344
345 string sql = "select EstateID from estate_settings where estate_settings.EstateName :EstateName"; 345 string sql = "select EstateID from estate_settings where estate_settings.EstateName = :EstateName";
346 346
347 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand(); 347 SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
348 348