aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTom2011-01-26 12:40:33 -0800
committerTom2011-01-26 12:40:33 -0800
commit4d3696d6581e61581915614b150909ff797a4956 (patch)
tree12465447ab18dcc9e9d44e7d4ad1b2a192735400 /OpenSim/Region
parentReproduce a corner case behavior for llListReplaceList (diff)
downloadopensim-SC-4d3696d6581e61581915614b150909ff797a4956.zip
opensim-SC-4d3696d6581e61581915614b150909ff797a4956.tar.gz
opensim-SC-4d3696d6581e61581915614b150909ff797a4956.tar.bz2
opensim-SC-4d3696d6581e61581915614b150909ff797a4956.tar.xz
Make llSHA1Hash SL compatible when using characters like the euro symbol (€)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index dffc0bd..1ccf76e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -32,6 +32,7 @@ using System.Diagnostics; //for [DebuggerNonUserCode]
32using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
33using System.Text; 33using System.Text;
34using System.Threading; 34using System.Threading;
35using System.Security.Cryptography;
35using System.Text.RegularExpressions; 36using System.Text.RegularExpressions;
36using Nini.Config; 37using Nini.Config;
37using log4net; 38using log4net;
@@ -6944,7 +6945,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6944 public LSL_String llSHA1String(string src) 6945 public LSL_String llSHA1String(string src)
6945 { 6946 {
6946 m_host.AddScriptLPS(1); 6947 m_host.AddScriptLPS(1);
6947 return Util.SHA1Hash(src).ToLower(); 6948 SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider();
6949 return BitConverter.ToString(SHA1.ComputeHash(Encoding.UTF8.GetBytes(src))).Replace("-", String.Empty).ToLower();
6948 } 6950 }
6949 6951
6950 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) 6952 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist)