aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-10 06:14:38 +0000
committerMelanie Thielker2008-09-10 06:14:38 +0000
commita68e34b5587723899cbc20e6e27a47ad01234718 (patch)
treee69778c8fb25b9407e0e94440349ab5049ed7186 /OpenSim/Data/MySQL
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-a68e34b5587723899cbc20e6e27a47ad01234718.zip
opensim-SC_OLD-a68e34b5587723899cbc20e6e27a47ad01234718.tar.gz
opensim-SC_OLD-a68e34b5587723899cbc20e6e27a47ad01234718.tar.bz2
opensim-SC_OLD-a68e34b5587723899cbc20e6e27a47ad01234718.tar.xz
Mantis #511
Allow parsing of hexadecimal int constants from strings. Also fixes a DBNull value in the touch type field crashing the sim
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs3
1 files changed, 2 insertions, 1 deletions
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
1226 prim.SalePrice = Convert.ToInt32(row["SalePrice"]); 1226 prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
1227 prim.ObjectSaleType = Convert.ToByte(row["SaleType"]); 1227 prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
1228 1228
1229 prim.ClickAction = Convert.ToByte(row["ClickAction"]); 1229 if (!row.IsNull("ClickAction"))
1230 prim.ClickAction = Convert.ToByte(row["ClickAction"]);
1230 1231
1231 return prim; 1232 return prim;
1232 } 1233 }