diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index c5c4ab3970..e12d37ae2c 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -864,11 +864,24 @@ namespace OpenSim.Framework
private static byte[] ComputeSHA1Hash(byte[] src)
{
byte[] ret;
- using(SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
- ret = SHA1.ComputeHash(src);
+ using (SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+ ret = SHA1.ComputeHash(src);
return ret;
}
+ public static UUID ComputeSHA1UUID(string src)
+ {
+ return ComputeSHA1UUID(Encoding.Default.GetBytes(src));
+ }
+
+ public static UUID ComputeSHA1UUID(byte[] src)
+ {
+ byte[] ret;
+ using (SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+ ret = SHA1.ComputeHash(src);
+ return new UUID(ret, 2);
+ }
+
public static int fast_distance2d(int x, int y)
{
x = Math.Abs(x);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index a6a4b1c612..1c4b538664 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -77,16 +77,17 @@ namespace OpenSim.Region.ClientStack.Linden
private string m_GridName = string.Empty;
private string m_GridURL = string.Empty;
+ private bool m_doScriptSyntax;
+ static private object m_scriptSyntaxLock = new object();
static private UUID m_scriptSyntaxID = UUID.Zero;
static private string m_scriptSyntaxXML;
- private bool m_doScriptSyntax;
#region ISharedRegionModule Members
public void Initialise(IConfigSource source)
{
IConfig config = source.Configs["SimulatorFeatures"];
- m_doScriptSyntax = false;
+ m_doScriptSyntax = true;
if (config != null)
{
//
@@ -330,40 +331,41 @@ namespace OpenSim.Region.ClientStack.Linden
private void ReadScriptSyntax()
{
- if(!m_doScriptSyntax || m_scriptSyntaxID != UUID.Zero)
- return;
-
- if(!File.Exists("ScriptSyntax.xml"))
- return;
-
- try
+ lock(m_scriptSyntaxLock)
{
- using (StreamReader sr = File.OpenText("ScriptSyntax.xml"))
+ if(!m_doScriptSyntax || m_scriptSyntaxID != UUID.Zero)
+ return;
+
+ if(!File.Exists("ScriptSyntax.xml"))
+ return;
+
+ try
{
- string version = sr.ReadLine();
- if(string.IsNullOrEmpty(version))
- return;
- if(!UUID.TryParse(version, out m_scriptSyntaxID))
- return;
-
- StringBuilder sb = new StringBuilder(400*1024);
- string s="";
- char[] trimc = new char[] {' ','\t', '\n', '\r'};
- while((s = sr.ReadLine()) != null)
+ using (StreamReader sr = File.OpenText("ScriptSyntax.xml"))
{
- s = s.Trim(trimc);
- if(String.IsNullOrEmpty(s) || s.StartsWith("<--"))
- continue;
- sb.Append(s);
+ StringBuilder sb = new StringBuilder(400*1024);
+ sb.Append("
+
+
+ tooltip
+ This event is triggered when a script comes within a defined angle of a target rotation. The range and rotation, are set by a call to llRotTarget.
+
+ at_target
+
+ attach
+
+ changed
+
+ collision
+
+ collision_end
+
+ collision_start
+
+ control
+
+ dataserver
+
+ email
+
+ http_request
+
+ http_response
+
+ land_collision
+
+ land_collision_end
+
+ land_collision_start
+
+ link_message
+
+ listen
+
+ money
+
+ moving_end
+
+ moving_start
+
+ no_sensor
+
+ not_at_rot_target
+
+ not_at_target
+
+ object_rez
+
+ on_rez
+
+ remote_data
+
+ run_time_permissions
+
+ sensor
+
+ state_entry
+
+ state_exit
+
+ timer
+
+ touch
+
+ touch_end
+
+ touch_start
+
+ transaction_result
+
+
+
+functions
+