diff options
author | Melanie | 2010-08-26 00:11:07 +0100 |
---|---|---|
committer | Melanie | 2010-08-26 00:11:07 +0100 |
commit | fc8d2be632c754338b136fe4a3d57c40b0190ce7 (patch) | |
tree | 94bb954bdf258e968e8c337ad1da57ba9fa68b91 /OpenSim/Data/MSSQL | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.zip opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.gz opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.bz2 opensim-SC-fc8d2be632c754338b136fe4a3d57c40b0190ce7.tar.xz |
Merge branch 'master' into careminster-presence-refactor
This was rather conflicted. Please test linking.
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index 7d017a6..7ff8737 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | |||
@@ -89,7 +89,6 @@ namespace OpenSim.Data.MSSQL | |||
89 | Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); | 89 | Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); |
90 | SceneObjectGroup grp = null; | 90 | SceneObjectGroup grp = null; |
91 | 91 | ||
92 | |||
93 | string sql = "SELECT *, " + | 92 | string sql = "SELECT *, " + |
94 | "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " + | 93 | "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " + |
95 | "FROM prims " + | 94 | "FROM prims " + |
@@ -232,7 +231,7 @@ namespace OpenSim.Data.MSSQL | |||
232 | /// <param name="regionUUID"></param> | 231 | /// <param name="regionUUID"></param> |
233 | public void StoreObject(SceneObjectGroup obj, UUID regionUUID) | 232 | public void StoreObject(SceneObjectGroup obj, UUID regionUUID) |
234 | { | 233 | { |
235 | _Log.InfoFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count); | 234 | _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count); |
236 | 235 | ||
237 | using (SqlConnection conn = new SqlConnection(m_connectionString)) | 236 | using (SqlConnection conn = new SqlConnection(m_connectionString)) |
238 | { | 237 | { |
@@ -291,7 +290,6 @@ namespace OpenSim.Data.MSSQL | |||
291 | } | 290 | } |
292 | } | 291 | } |
293 | } | 292 | } |
294 | |||
295 | } | 293 | } |
296 | 294 | ||
297 | /// <summary> | 295 | /// <summary> |