aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2012-06-07 23:41:00 +0200
committerMelanie2012-06-07 23:41:00 +0200
commitb700f58d5e82f971c7f6e4381e8ae99ca230977a (patch)
tree422cba61bc420c18bd779698f901e16762927b09 /OpenSim/Data
parentAdd the ability to query the MYSQL databse for a list of the stored prim UUIDs (diff)
downloadopensim-SC-b700f58d5e82f971c7f6e4381e8ae99ca230977a.zip
opensim-SC-b700f58d5e82f971c7f6e4381e8ae99ca230977a.tar.gz
opensim-SC-b700f58d5e82f971c7f6e4381e8ae99ca230977a.tar.bz2
opensim-SC-b700f58d5e82f971c7f6e4381e8ae99ca230977a.tar.xz
Typo fix
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index b978334..1999d89 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -119,8 +119,10 @@ namespace OpenSim.Data.MySQL
119 119
120 // Eligibility check 120 // Eligibility check
121 // 121 //
122 if ((flags & (uint)PrimFlags.Temporary) != 0) 122 // PrimFlags.Temporary is not used in OpenSim code and cannot
123 return; 123 // be guaranteed to always be clear. Don't check it.
124// if ((flags & (uint)PrimFlags.Temporary) != 0)
125// return;
124 if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0) 126 if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
125 return; 127 return;
126 128
@@ -1923,7 +1925,7 @@ namespace OpenSim.Data.MySQL
1923 1925
1924 using (MySqlCommand cmd = dbcon.CreateCommand()) 1926 using (MySqlCommand cmd = dbcon.CreateCommand())
1925 { 1927 {
1926 cmd.CommandText = "select UUID prom prims where RegionUUID = ?RegionUUID"; 1928 cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID";
1927 cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString()); 1929 cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
1928 1930
1929 using (IDataReader reader = ExecuteReader(cmd)) 1931 using (IDataReader reader = ExecuteReader(cmd))