OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

let the syntax file include its id again

0.9.1.0-post-fixes
UbitUmarov 2018-10-25 02:36:36 +01:00
parent a95397e8f5
commit a1d132d3ca
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@ -347,6 +347,15 @@ namespace OpenSim.Region.ClientStack.Linden
string s=""; string s="";
char[] trimc = new char[] {' ','\t', '\n', '\r'}; char[] trimc = new char[] {' ','\t', '\n', '\r'};
s = sr.ReadLine();
if(s == null)
return;
s = s.Trim(trimc);
UUID id;
if(!UUID.TryParse(s,out id))
return;
while ((s = sr.ReadLine()) != null) while ((s = sr.ReadLine()) != null)
{ {
s = s.Trim(trimc); s = s.Trim(trimc);
@ -355,7 +364,7 @@ namespace OpenSim.Region.ClientStack.Linden
sb.Append(s); sb.Append(s);
} }
m_scriptSyntaxXML = sb.ToString(); m_scriptSyntaxXML = sb.ToString();
m_scriptSyntaxID = Util.ComputeSHA1UUID(m_scriptSyntaxXML); m_scriptSyntaxID = id;
} }
} }
catch catch

1
bin/ScriptSyntax.xml
View File

@ -1,3 +1,4 @@
a6ccf55f-ded5-9093-571c-478cadca66de
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer> <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
<key>controls</key> <key>controls</key>
<map> <map>