diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 4335592..d528160 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -10903,31 +10903,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10903 | public LSL_Float llListStatistics(int operation, LSL_List src) | 10903 | public LSL_Float llListStatistics(int operation, LSL_List src) |
10904 | { | 10904 | { |
10905 | m_host.AddScriptLPS(1); | 10905 | m_host.AddScriptLPS(1); |
10906 | LSL_List nums = LSL_List.ToDoubleList(src); | ||
10907 | switch (operation) | 10906 | switch (operation) |
10908 | { | 10907 | { |
10909 | case ScriptBaseClass.LIST_STAT_RANGE: | 10908 | case ScriptBaseClass.LIST_STAT_RANGE: |
10910 | return nums.Range(); | 10909 | return src.Range(); |
10911 | case ScriptBaseClass.LIST_STAT_MIN: | 10910 | case ScriptBaseClass.LIST_STAT_MIN: |
10912 | return nums.Min(); | 10911 | return src.Min(); |
10913 | case ScriptBaseClass.LIST_STAT_MAX: | 10912 | case ScriptBaseClass.LIST_STAT_MAX: |
10914 | return nums.Max(); | 10913 | return src.Max(); |
10915 | case ScriptBaseClass.LIST_STAT_MEAN: | 10914 | case ScriptBaseClass.LIST_STAT_MEAN: |
10916 | return nums.Mean(); | 10915 | return src.Mean(); |
10917 | case ScriptBaseClass.LIST_STAT_MEDIAN: | 10916 | case ScriptBaseClass.LIST_STAT_MEDIAN: |
10918 | return nums.Median(); | 10917 | return LSL_List.ToDoubleList(src).Median(); |
10919 | case ScriptBaseClass.LIST_STAT_NUM_COUNT: | 10918 | case ScriptBaseClass.LIST_STAT_NUM_COUNT: |
10920 | return nums.NumericLength(); | 10919 | return src.NumericLength(); |
10921 | case ScriptBaseClass.LIST_STAT_STD_DEV: | 10920 | case ScriptBaseClass.LIST_STAT_STD_DEV: |
10922 | return nums.StdDev(); | 10921 | return src.StdDev(); |
10923 | case ScriptBaseClass.LIST_STAT_SUM: | 10922 | case ScriptBaseClass.LIST_STAT_SUM: |
10924 | return nums.Sum(); | 10923 | return src.Sum(); |
10925 | case ScriptBaseClass.LIST_STAT_SUM_SQUARES: | 10924 | case ScriptBaseClass.LIST_STAT_SUM_SQUARES: |
10926 | return nums.SumSqrs(); | 10925 | return src.SumSqrs(); |
10927 | case ScriptBaseClass.LIST_STAT_GEOMETRIC_MEAN: | 10926 | case ScriptBaseClass.LIST_STAT_GEOMETRIC_MEAN: |
10928 | return nums.GeometricMean(); | 10927 | return src.GeometricMean(); |
10929 | case ScriptBaseClass.LIST_STAT_HARMONIC_MEAN: | 10928 | case ScriptBaseClass.LIST_STAT_HARMONIC_MEAN: |
10930 | return nums.HarmonicMean(); | 10929 | return src.HarmonicMean(); |
10931 | default: | 10930 | default: |
10932 | return 0.0; | 10931 | return 0.0; |
10933 | } | 10932 | } |