diff options
| author | Melanie | 2010-07-11 13:32:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-11 13:32:10 +0100 |
| commit | 922e874653e81ae9b72da210ecfe1d2eb5efa9c6 (patch) | |
| tree | 25ac2c896c952ca7298cecb700b61f7301439216 /OpenSim/Data | |
| parent | Fix the synchronousrestformsrequester so it will successfully handle a respon... (diff) | |
| parent | Remove localID from script controls data. It won't transfer to another (diff) | |
| download | opensim-SC-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.zip opensim-SC-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.gz opensim-SC-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.bz2 opensim-SC-922e874653e81ae9b72da210ecfe1d2eb5efa9c6.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteEstateData.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs | 4 |
2 files changed, 4 insertions, 4 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 | ||
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs index e135eaa..bf8ee14 100644 --- a/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs +++ b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs | |||
| @@ -328,7 +328,7 @@ namespace OpenSim.Data.SQLiteLegacy | |||
| 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.SQLiteLegacy | |||
| 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 | ||