OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

fsassets
Diva Canto 2015-06-25 15:02:06 -07:00
parent c299414d50 3aa9e786de
commit 0e401238e7
2 changed files with 127 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/PGSQL/PGSQLEstateData.cs
View File

@ -500,7 +500,7 @@ namespace OpenSim.Data.PGSQL
public List<int> GetEstatesByOwner(UUID ownerID) public List<int> GetEstatesByOwner(UUID ownerID)
{ {
List<int> result = new List<int>(); List<int> result = new List<int>();
string sql = "select \"estateID\" from estate_settings where \"EstateOwner\" = :EstateOwner"; string sql = "select \"EstateID\" from estate_settings where \"EstateOwner\" = :EstateOwner";
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
{ {
conn.Open(); conn.Open();

5
OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
View File

@ -46,7 +46,8 @@ namespace OpenSim.Data.PGSQL
#region Properites #region Properites
string ConnectionString string ConnectionString
{ {
get; set; get;
set;
} }
protected virtual Assembly Assembly protected virtual Assembly Assembly
@ -219,7 +220,7 @@ namespace OpenSim.Data.PGSQL
{ {
string query = string.Empty; string query = string.Empty;
query = @"DELETE FROM classifieds WHERE classifieduuid = :ClasifiedId ;"; query = @"DELETE FROM classifieds WHERE classifieduuid = :ClassifiedId ;";
try try
{ {