From a68e34b5587723899cbc20e6e27a47ad01234718 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 10 Sep 2008 06:14:38 +0000
Subject: Mantis #511 Allow parsing of hexadecimal int constants from strings.
 Also fixes a DBNull value in the touch type field crashing the sim

---
 OpenSim/Data/MySQL/MySQLRegionData.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL/MySQLRegionData.cs')

diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 920a001..9c36d49 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -1226,7 +1226,8 @@ namespace OpenSim.Data.MySQL
             prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
             prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
 
-            prim.ClickAction = Convert.ToByte(row["ClickAction"]);
+            if (!row.IsNull("ClickAction"))
+                prim.ClickAction = Convert.ToByte(row["ClickAction"]);
 
             return prim;
         }
-- 
cgit v1.1