diff options
author | Tom | 2011-01-26 12:54:12 -0800 |
---|---|---|
committer | Tom | 2011-01-26 12:54:12 -0800 |
commit | 04c62c4959d99ed3a8d350464db64aac6db1ec5f (patch) | |
tree | e238c4da8ea7beaf4159fa0f7c32a18718b89f72 /OpenSim/Region | |
parent | Provide an SL compatible llMD5String function across all platforms (diff) | |
download | opensim-SC_OLD-04c62c4959d99ed3a8d350464db64aac6db1ec5f.zip opensim-SC_OLD-04c62c4959d99ed3a8d350464db64aac6db1ec5f.tar.gz opensim-SC_OLD-04c62c4959d99ed3a8d350464db64aac6db1ec5f.tar.bz2 opensim-SC_OLD-04c62c4959d99ed3a8d350464db64aac6db1ec5f.tar.xz |
Revert my previous SHA1 commit in favour of a better implementation
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 45af13a..f5b7f5f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -32,7 +32,6 @@ using System.Diagnostics; //for [DebuggerNonUserCode] | |||
32 | using System.Runtime.Remoting.Lifetime; | 32 | using System.Runtime.Remoting.Lifetime; |
33 | using System.Text; | 33 | using System.Text; |
34 | using System.Threading; | 34 | using System.Threading; |
35 | using System.Security.Cryptography; | ||
36 | using System.Text.RegularExpressions; | 35 | using System.Text.RegularExpressions; |
37 | using Nini.Config; | 36 | using Nini.Config; |
38 | using log4net; | 37 | using log4net; |
@@ -6945,8 +6944,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6945 | public LSL_String llSHA1String(string src) | 6944 | public LSL_String llSHA1String(string src) |
6946 | { | 6945 | { |
6947 | m_host.AddScriptLPS(1); | 6946 | m_host.AddScriptLPS(1); |
6948 | SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider(); | 6947 | return Util.SHA1Hash(src, Encoding.UTF8).ToLower(); |
6949 | return BitConverter.ToString(SHA1.ComputeHash(Encoding.UTF8.GetBytes(src))).Replace("-", String.Empty).ToLower(); | ||
6950 | } | 6948 | } |
6951 | 6949 | ||
6952 | protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) | 6950 | protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) |