diff options
| author | Melanie | 2014-01-28 21:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-28 21:02:20 +0000 |
| commit | c6e9db58669d773c85041db99b19b942f70324f7 (patch) | |
| tree | 99f69fb669332cff69a45ce6f7473aed6d965a0d /OpenSim/Framework/Util.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC-c6e9db58669d773c85041db99b19b942f70324f7.zip opensim-SC-c6e9db58669d773c85041db99b19b942f70324f7.tar.gz opensim-SC-c6e9db58669d773c85041db99b19b942f70324f7.tar.bz2 opensim-SC-c6e9db58669d773c85041db99b19b942f70324f7.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index eefbde5..1775fef 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1043,7 +1043,7 @@ namespace OpenSim.Framework | |||
| 1043 | else if (typeof(T) == typeof(Int32)) | 1043 | else if (typeof(T) == typeof(Int32)) |
| 1044 | val = cnf.GetInt(varname, (int)val); | 1044 | val = cnf.GetInt(varname, (int)val); |
| 1045 | else if (typeof(T) == typeof(float)) | 1045 | else if (typeof(T) == typeof(float)) |
| 1046 | val = cnf.GetFloat(varname, (int)val); | 1046 | val = cnf.GetFloat(varname, (float)val); |
| 1047 | else | 1047 | else |
| 1048 | m_log.ErrorFormat("[UTIL]: Unhandled type {0}", typeof(T)); | 1048 | m_log.ErrorFormat("[UTIL]: Unhandled type {0}", typeof(T)); |
| 1049 | } | 1049 | } |