diff options
author | Jeff Ames | 2009-10-01 01:00:09 +0900 |
---|---|---|
committer | Jeff Ames | 2009-10-01 01:17:47 +0900 |
commit | ee205e7e812e170f670e690a4e0fa9caa652f226 (patch) | |
tree | df407e66d9aa47a884e39d5d86b877d6ef468a1a /OpenSim/Data/MSSQL | |
parent | adding LandDataSerializer (not connected anywhere, work-in-progress) (diff) | |
download | opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.zip opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.gz opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.bz2 opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAssetData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index d193cf5..25f7cf0 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
@@ -175,7 +175,7 @@ namespace OpenSim.Data.MSSQL | |||
175 | (@id, @name, @description, @assetType, @local, | 175 | (@id, @name, @description, @assetType, @local, |
176 | @temporary, @create_time, @access_time, @data)"; | 176 | @temporary, @create_time, @access_time, @data)"; |
177 | 177 | ||
178 | string assetName = asset.Name; | 178 | string assetName = asset.Name; |
179 | if (asset.Name.Length > 64) | 179 | if (asset.Name.Length > 64) |
180 | { | 180 | { |
181 | assetName = asset.Name.Substring(0, 64); | 181 | assetName = asset.Name.Substring(0, 64); |
@@ -223,7 +223,7 @@ namespace OpenSim.Data.MSSQL | |||
223 | local = @local, temporary = @temporary, data = @data | 223 | local = @local, temporary = @temporary, data = @data |
224 | WHERE id = @keyId;"; | 224 | WHERE id = @keyId;"; |
225 | 225 | ||
226 | string assetName = asset.Name; | 226 | string assetName = asset.Name; |
227 | if (asset.Name.Length > 64) | 227 | if (asset.Name.Length > 64) |
228 | { | 228 | { |
229 | assetName = asset.Name.Substring(0, 64); | 229 | assetName = asset.Name.Substring(0, 64); |
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 27a4e70..1482184 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |||
@@ -428,7 +428,7 @@ namespace OpenSim.Data.MSSQL | |||
428 | @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType, | 428 | @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType, |
429 | @creationDate, @groupID, @groupOwned, @flags)"; | 429 | @creationDate, @groupID, @groupOwned, @flags)"; |
430 | 430 | ||
431 | string itemName = item.Name; | 431 | string itemName = item.Name; |
432 | if (item.Name.Length > 64) | 432 | if (item.Name.Length > 64) |
433 | { | 433 | { |
434 | itemName = item.Name.Substring(0, 64); | 434 | itemName = item.Name.Substring(0, 64); |
@@ -529,7 +529,7 @@ namespace OpenSim.Data.MSSQL | |||
529 | { | 529 | { |
530 | itemDesc = item.Description.Substring(0, 128); | 530 | itemDesc = item.Description.Substring(0, 128); |
531 | m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update"); | 531 | m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update"); |
532 | } | 532 | } |
533 | 533 | ||
534 | using (AutoClosingSqlCommand command = database.Query(sql)) | 534 | using (AutoClosingSqlCommand command = database.Query(sql)) |
535 | { | 535 | { |
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index adedcce..e26a830 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.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/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs index e0c0ed6..38be9f4 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Data.MSSQL | |||
52 | conn.Open(); | 52 | conn.Open(); |
53 | Migration m = new Migration(conn, GetType().Assembly, "UserStore"); | 53 | Migration m = new Migration(conn, GetType().Assembly, "UserStore"); |
54 | m.Update(); | 54 | m.Update(); |
55 | } | 55 | } |
56 | } | 56 | } |
57 | 57 | ||
58 | public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) | 58 | public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) |
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index 6efb89d..3ef1053 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -1146,7 +1146,7 @@ ELSE | |||
1146 | if (reader.IsDBNull(reader.GetOrdinal("homeRegionID"))) | 1146 | if (reader.IsDBNull(reader.GetOrdinal("homeRegionID"))) |
1147 | retval.HomeRegionID = UUID.Zero; | 1147 | retval.HomeRegionID = UUID.Zero; |
1148 | else | 1148 | else |
1149 | retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]); | 1149 | retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]); |
1150 | 1150 | ||
1151 | retval.Created = Convert.ToInt32(reader["created"].ToString()); | 1151 | retval.Created = Convert.ToInt32(reader["created"].ToString()); |
1152 | retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); | 1152 | retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); |
@@ -1200,7 +1200,7 @@ ELSE | |||
1200 | if (reader.IsDBNull(reader.GetOrdinal("partner"))) | 1200 | if (reader.IsDBNull(reader.GetOrdinal("partner"))) |
1201 | retval.Partner = UUID.Zero; | 1201 | retval.Partner = UUID.Zero; |
1202 | else | 1202 | else |
1203 | retval.Partner = new UUID((Guid)reader["partner"]); | 1203 | retval.Partner = new UUID((Guid)reader["partner"]); |
1204 | } | 1204 | } |
1205 | else | 1205 | else |
1206 | { | 1206 | { |