diff options
author | Justin Clarke Casey | 2008-05-01 12:08:22 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-01 12:08:22 +0000 |
commit | 9024fe68fc3ab5e3e4fde2a88b63ddd67c335490 (patch) | |
tree | 0f5ed23ce779a874abd9537498dfcf8b4f3a2730 /OpenSim | |
parent | * You can now rez objects out of inventory at the correct offset from prim yo... (diff) | |
download | opensim-SC-9024fe68fc3ab5e3e4fde2a88b63ddd67c335490.zip opensim-SC-9024fe68fc3ab5e3e4fde2a88b63ddd67c335490.tar.gz opensim-SC-9024fe68fc3ab5e3e4fde2a88b63ddd67c335490.tar.bz2 opensim-SC-9024fe68fc3ab5e3e4fde2a88b63ddd67c335490.tar.xz |
* Insert temporary cast exception catching code to deal with mantis 1099 - mysql inventoryitems table problem
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 23d2ea5..991e9c7 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -333,12 +333,38 @@ 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 | |
337 | try | ||
338 | { | ||
339 | item.SalePrice = (int) reader["salePrice"]; | ||
340 | } | ||
341 | catch (InvalidCastException) | ||
342 | { | ||
343 | m_log.WarnFormat("Could not cast salePrice {0} to {1}", reader["salePrice"], "int"); | ||
344 | } | ||
345 | |||
337 | item.SaleType = Convert.ToByte(reader["saleType"]); | 346 | item.SaleType = Convert.ToByte(reader["saleType"]); |
338 | item.CreationDate = (int) reader["creationDate"]; | 347 | |
348 | try | ||
349 | { | ||
350 | item.CreationDate = (int) reader["creationDate"]; | ||
351 | } | ||
352 | catch (InvalidCastException) | ||
353 | { | ||
354 | m_log.WarnFormat("Could not cast creationDate {0} to {1}", reader["creationDate"], "int"); | ||
355 | } | ||
356 | |||
339 | item.GroupID = new LLUUID(reader["groupID"].ToString()); | 357 | item.GroupID = new LLUUID(reader["groupID"].ToString()); |
340 | item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); | 358 | item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); |
341 | item.Flags = (uint) reader["flags"]; | 359 | |
360 | try | ||
361 | { | ||
362 | item.Flags = (uint) reader["flags"]; | ||
363 | } | ||
364 | catch (InvalidCastException) | ||
365 | { | ||
366 | m_log.WarnFormat("Could not cast flags {0} to {1}", reader["flags"], "uint"); | ||
367 | } | ||
342 | 368 | ||
343 | return item; | 369 | return item; |
344 | } | 370 | } |