diff options
| author | Jeff Ames | 2008-05-06 22:41:38 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-05-06 22:41:38 +0000 |
| commit | 0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7 (patch) | |
| tree | 92221f03df2e93be0399a008ba4927977067a888 /OpenSim/Data | |
| parent | send actual velocity and angular velocity in terse updates (diff) | |
| download | opensim-SC_OLD-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.zip opensim-SC_OLD-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.tar.gz opensim-SC_OLD-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.tar.bz2 opensim-SC_OLD-0ea48cf7860a83e30e4401b4bb1ff4b4eb3ae3a7.tar.xz | |
De-tabify source.
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 13 | ||||
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 032b2c2..611a559 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |||
| @@ -198,7 +198,6 @@ namespace OpenSim.Data.MSSQL | |||
| 198 | while (reader.Read()) | 198 | while (reader.Read()) |
| 199 | items.Add(readInventoryFolder(reader)); | 199 | items.Add(readInventoryFolder(reader)); |
| 200 | 200 | ||
| 201 | |||
| 202 | reader.Close(); | 201 | reader.Close(); |
| 203 | result.Dispose(); | 202 | result.Dispose(); |
| 204 | 203 | ||
| @@ -321,12 +320,12 @@ namespace OpenSim.Data.MSSQL | |||
| 321 | item.Creator = new LLUUID((string) reader["creatorID"]); | 320 | item.Creator = new LLUUID((string) reader["creatorID"]); |
| 322 | item.BasePermissions = Convert.ToUInt32(reader["inventoryBasePermissions"]); | 321 | item.BasePermissions = Convert.ToUInt32(reader["inventoryBasePermissions"]); |
| 323 | item.EveryOnePermissions = Convert.ToUInt32(reader["inventoryEveryOnePermissions"]); | 322 | item.EveryOnePermissions = Convert.ToUInt32(reader["inventoryEveryOnePermissions"]); |
| 324 | item.SalePrice = (int) reader["salePrice"]; | 323 | item.SalePrice = (int) reader["salePrice"]; |
| 325 | item.SaleType = Convert.ToByte(reader["saleType"]); | 324 | item.SaleType = Convert.ToByte(reader["saleType"]); |
| 326 | item.CreationDate = (int) reader["creationDate"]; | 325 | item.CreationDate = (int) reader["creationDate"]; |
| 327 | item.GroupID = new LLUUID(reader["groupID"].ToString()); | 326 | item.GroupID = new LLUUID(reader["groupID"].ToString()); |
| 328 | item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); | 327 | item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); |
| 329 | item.Flags = (uint) reader["flags"]; | 328 | item.Flags = (uint) reader["flags"]; |
| 330 | 329 | ||
| 331 | return item; | 330 | return item; |
| 332 | } | 331 | } |
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index b529d4e..90664ff 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
| @@ -333,7 +333,7 @@ namespace OpenSim.Data.MySQL | |||
| 333 | item.Creator = new LLUUID((string) reader["creatorID"]); | 333 | item.Creator = new LLUUID((string) reader["creatorID"]); |
| 334 | item.BasePermissions = (uint) reader["inventoryBasePermissions"]; | 334 | item.BasePermissions = (uint) reader["inventoryBasePermissions"]; |
| 335 | item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"]; | 335 | item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"]; |
| 336 | item.SalePrice = (int) reader["salePrice"]; | 336 | item.SalePrice = (int) reader["salePrice"]; |
| 337 | item.SaleType = Convert.ToByte(reader["saleType"]); | 337 | item.SaleType = Convert.ToByte(reader["saleType"]); |
| 338 | item.CreationDate = (int) reader["creationDate"]; | 338 | item.CreationDate = (int) reader["creationDate"]; |
| 339 | item.GroupID = new LLUUID(reader["groupID"].ToString()); | 339 | item.GroupID = new LLUUID(reader["groupID"].ToString()); |