aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2014-01-19 07:26:55 -0800
committerRobert Adams2014-01-19 07:37:14 -0800
commit4fb3d314b85019af0e30cf0c2e7c24e9bf32ab66 (patch)
treecdc99fd36b23570924754e7139318ea0704c0dc0
parentMerge branch 'justincc-master' (diff)
downloadopensim-SC-4fb3d314b85019af0e30cf0c2e7c24e9bf32ab66.zip
opensim-SC-4fb3d314b85019af0e30cf0c2e7c24e9bf32ab66.tar.gz
opensim-SC-4fb3d314b85019af0e30cf0c2e7c24e9bf32ab66.tar.bz2
opensim-SC-4fb3d314b85019af0e30cf0c2e7c24e9bf32ab66.tar.xz
Fix casting error for float type INI file parameter parsing.
-rw-r--r--OpenSim/Framework/Util.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index cebba46..7bc8176 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1031,7 +1031,7 @@ namespace OpenSim.Framework
1031 else if (typeof(T) == typeof(Int32)) 1031 else if (typeof(T) == typeof(Int32))
1032 val = cnf.GetInt(varname, (int)val); 1032 val = cnf.GetInt(varname, (int)val);
1033 else if (typeof(T) == typeof(float)) 1033 else if (typeof(T) == typeof(float))
1034 val = cnf.GetFloat(varname, (int)val); 1034 val = cnf.GetFloat(varname, (float)val);
1035 else 1035 else
1036 m_log.ErrorFormat("[UTIL]: Unhandled type {0}", typeof(T)); 1036 m_log.ErrorFormat("[UTIL]: Unhandled type {0}", typeof(T));
1037 } 1037 }