diff options
author | Melanie | 2009-10-19 21:58:51 +0100 |
---|---|---|
committer | Melanie | 2009-10-19 21:58:51 +0100 |
commit | ffd59868f5e2d797160b1bbfc13f3b4bac717b36 (patch) | |
tree | fb807a129a6e449ac17dadce15d7b27268c92c3f /OpenSim/Data/MSSQL/MSSQLRegionData.cs | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Minor formatting cleanup. (diff) | |
download | opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.zip opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.gz opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.bz2 opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||