aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-19 15:19:37 -0700
committerJohn Hurliman2009-10-19 15:19:37 -0700
commitbd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch)
treec6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Data
parent* Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff)
parentMinor formatting cleanup. (diff)
downloadopensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip
opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz
opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2
opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs6
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserAccountData.cs6
4 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
index 9a17e47..801610a 100644
--- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Data.MSSQL
119 updateBuilder.AppendFormat("{0} = @{0}",field); 119 updateBuilder.AppendFormat("{0} = @{0}",field);
120 120
121 first = false; 121 first = false;
122 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); 122 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
123 } 123 }
124 124
125 updateBuilder.Append(" where UUID = @principalID"); 125 updateBuilder.Append(" where UUID = @principalID");
@@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL
135 135
136 insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm); 136 insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm);
137 insertBuilder.Append(String.Join(", ", fields)); 137 insertBuilder.Append(String.Join(", ", fields));
138 insertBuilder.Append(") values ( @principalID, @"); 138 insertBuilder.Append(") values (@principalID, @");
139 insertBuilder.Append(String.Join(", @", fields)); 139 insertBuilder.Append(String.Join(", @", fields));
140 insertBuilder.Append(")"); 140 insertBuilder.Append(")");
141 141
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index e2ae5cb..cff6b00 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MSSQL
146 sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID); 146 sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID);
147 147
148 sceneObjectPart.UUID = groupID; 148 sceneObjectPart.UUID = groupID;
149 } 149 }
150 150
151 grp = new SceneObjectGroup(sceneObjectPart); 151 grp = new SceneObjectGroup(sceneObjectPart);
152 } 152 }
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 78d7fd0..a898aab 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Data.MSSQL
62 conn.Open(); 62 conn.Open();
63 Migration m = new Migration(conn, GetType().Assembly, "GridStore"); 63 Migration m = new Migration(conn, GetType().Assembly, "GridStore");
64 m.Update(); 64 m.Update();
65 } 65 }
66 } 66 }
67 67
68 public List<RegionData> Get(string regionName, UUID scopeID) 68 public List<RegionData> Get(string regionName, UUID scopeID)
@@ -98,7 +98,7 @@ namespace OpenSim.Data.MSSQL
98 return null; 98 return null;
99 99
100 return ret[0]; 100 return ret[0];
101 } 101 }
102 } 102 }
103 103
104 public RegionData Get(UUID regionID, UUID scopeID) 104 public RegionData Get(UUID regionID, UUID scopeID)
@@ -251,7 +251,7 @@ namespace OpenSim.Data.MSSQL
251 { 251 {
252 string insert = "insert into [" + m_Realm + "] ([uuid], [ScopeID], [locX], [locY], [sizeX], [sizeY], [regionName], [" + 252 string insert = "insert into [" + m_Realm + "] ([uuid], [ScopeID], [locX], [locY], [sizeX], [sizeY], [regionName], [" +
253 String.Join("], [", fields) + 253 String.Join("], [", fields) +
254 "]) values ( @regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")"; 254 "]) values (@regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")";
255 255
256 cmd.CommandText = insert; 256 cmd.CommandText = insert;
257 257
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 7b6e7c8..2d92cb1 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Data.MSSQL
54 conn.Open(); 54 conn.Open();
55 Migration m = new Migration(conn, GetType().Assembly, "UserStore"); 55 Migration m = new Migration(conn, GetType().Assembly, "UserStore");
56 m.Update(); 56 m.Update();
57 } 57 }
58 } 58 }
59 59
60 public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) 60 public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
@@ -134,7 +134,7 @@ namespace OpenSim.Data.MSSQL
134 updateBuilder.AppendFormat("{0} = @{0}", field); 134 updateBuilder.AppendFormat("{0} = @{0}", field);
135 135
136 first = false; 136 first = false;
137 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); 137 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
138 } 138 }
139 139
140 updateBuilder.Append(" where UUID = @principalID"); 140 updateBuilder.Append(" where UUID = @principalID");
@@ -153,7 +153,7 @@ namespace OpenSim.Data.MSSQL
153 StringBuilder insertBuilder = new StringBuilder(); 153 StringBuilder insertBuilder = new StringBuilder();
154 insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm); 154 insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm);
155 insertBuilder.Append(String.Join(", ", fields)); 155 insertBuilder.Append(String.Join(", ", fields));
156 insertBuilder.Append(") values ( @principalID, @scopeID, @"); 156 insertBuilder.Append(") values (@principalID, @scopeID, @");
157 insertBuilder.Append(String.Join(", @", fields)); 157 insertBuilder.Append(String.Join(", @", fields));
158 insertBuilder.Append(")"); 158 insertBuilder.Append(")");
159 159