From 82287f9eedfde7d8dfedbf6639277b1cd98eb105 Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Thu, 5 Apr 2012 17:44:47 +0100 Subject: [PATCH 1/6] Changes to configuration files. --- trunk/Properties/Settings.Designer.cs | 4 +- .../org.lsleditor.www/Reference.cs | 4 +- trunk/app.config | 37 +++++++++---------- trunk/lsleditor.csproj | 3 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/trunk/Properties/Settings.Designer.cs b/trunk/Properties/Settings.Designer.cs index e6192fd..f1b8481 100644 --- a/trunk/Properties/Settings.Designer.cs +++ b/trunk/Properties/Settings.Designer.cs @@ -1204,7 +1204,7 @@ namespace LSLEditor.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/check4update.php")] + [global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/check4update.php")] public string Update { get { return ((string)(this["Update"])); @@ -1213,7 +1213,7 @@ namespace LSLEditor.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/update.php")] + [global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/update.php")] public string UpdateManifest { get { return ((string)(this["UpdateManifest"])); diff --git a/trunk/Web References/org.lsleditor.www/Reference.cs b/trunk/Web References/org.lsleditor.www/Reference.cs index e094393..64accb6 100644 --- a/trunk/Web References/org.lsleditor.www/Reference.cs +++ b/trunk/Web References/org.lsleditor.www/Reference.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.225 +// Runtime Version:4.0.30319.261 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.225. +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.261. // #pragma warning disable 1591 diff --git a/trunk/app.config b/trunk/app.config index 835397a..c4a6b36 100644 --- a/trunk/app.config +++ b/trunk/app.config @@ -1,12 +1,11 @@ - - + -
+
-
+
@@ -18,7 +17,7 @@ False - + LSLEditor Island @@ -30,13 +29,13 @@ youraddress@yourdomain.ext - + - + - + 0, 0 @@ -123,10 +122,10 @@ True - + - + PLAIN @@ -138,13 +137,13 @@ False - + - + - + False @@ -177,19 +176,19 @@ False - + - + - + False - + Production @@ -316,8 +315,8 @@ http://metaversegames.net/questions/lsl - + - \ No newline at end of file + diff --git a/trunk/lsleditor.csproj b/trunk/lsleditor.csproj index 192d0b7..4fefa0d 100644 --- a/trunk/lsleditor.csproj +++ b/trunk/lsleditor.csproj @@ -43,7 +43,8 @@ 1.0.0.%2a false true - v2.0 + v3.5 + ..\bin\Debug\ From a442da2ba8f32355b98f7a6ed9cd298f701aacbc Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Thu, 5 Apr 2012 18:03:19 +0100 Subject: [PATCH 2/6] Fix for SF-3072580 and ensure UTF-8 encoding is used instead of ASCII. Thanks to Akkarin Dryke for the 3072580 fix. --- trunk/Helpers/HTTPRequest.cs | 26 +++++++++++++++++++++----- trunk/Resource/ReleaseNotes.htm | 12 +++++++++++- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/trunk/Helpers/HTTPRequest.cs b/trunk/Helpers/HTTPRequest.cs index ca1568b..8fde113 100644 --- a/trunk/Helpers/HTTPRequest.cs +++ b/trunk/Helpers/HTTPRequest.cs @@ -42,6 +42,8 @@ // ******** // */ using System; +using System.IO; +using System.IO.Compression; using System.Net; using System.Text; @@ -63,7 +65,7 @@ namespace LSLEditor public static void Request(WebProxy proxy, SecondLife secondlife, string strUrl, SecondLife.list parameters, string postData, SecondLife.key key) { string strMethod = "GET"; - string strContentType = "text/plain;charset=utf-8"; + string strContentType = "text/plain; charset=utf-8"; for (int intI = 0; intI < parameters.Count; intI += 2) { @@ -94,7 +96,7 @@ namespace LSLEditor wc.Headers.Add("Content-Type", strContentType); wc.Headers.Add("Accept", "text/*"); - wc.Headers.Add("Accept-Charset", "utf-8;q=1.0, *;q=0.5"); + wc.Headers.Add("Accept-Charset", "utf-8; q=1.0, *; q=0.5"); wc.Headers.Add("Accept-Encoding", "deflate, gzip"); wc.Headers.Add("User-Agent", "Second Life LSL/1.19.0(12345) (http://secondlife.com)"); @@ -172,7 +174,9 @@ namespace LSLEditor else { if (e.Result != null) - strResult = Encoding.ASCII.GetString(e.Result); + { + strResult = Encoding.UTF8.GetString(e.Result); + } } userState.secondlife.host.ExecuteSecondLife("http_response", userState.httpkey, (SecondLife.integer)intStatusCode, new SecondLife.list(), (SecondLife.String)strResult); } @@ -194,10 +198,22 @@ namespace LSLEditor else { if (e.Result != null) - strResult = Encoding.ASCII.GetString(e.Result); + { + string strEncoding = ((System.Net.WebClient)sender).ResponseHeaders["Content-Encoding"]; + if (strEncoding == "gzip") + { + GZipStream tempE = new GZipStream(new System.IO.MemoryStream(e.Result), CompressionMode.Decompress); + + var sr = new StreamReader(tempE); + strResult = sr.ReadToEnd(); + } + else + { + strResult = Encoding.UTF8.GetString(e.Result); + } + } } userState.secondlife.host.ExecuteSecondLife("http_response", userState.httpkey, (SecondLife.integer)intStatusCode, new SecondLife.list(), (SecondLife.String)strResult); } - } } diff --git a/trunk/Resource/ReleaseNotes.htm b/trunk/Resource/ReleaseNotes.htm index 734b2f2..d447676 100644 --- a/trunk/Resource/ReleaseNotes.htm +++ b/trunk/Resource/ReleaseNotes.htm @@ -7,9 +7,19 @@
+
+

<2012-04-00 - Release 2.46.0

+
+ * Fixed: +
    +
  • SF ID: 3072580 - HTTP Request response returned gzip compressed string. (Thanks to Akkarin Dryke).
    • +
  • Also fixed HTTP Request response returning UTF-8 (instead of ASCII).
    • +
+
+

2012-03-18 - Release 2.45.1

-
- Fixed: Problem with updater. Our BZip2 decompression code did not work, which prevented the updater creating the new file.
+
* Fixed: Problem with updater. Our BZip2 decompression code did not work, which prevented the updater creating the new file.

2012-03-14 - Release 2.45.0

From 9dcbc4b09fb143e4ddfc35f97a1dd22aaffdeb45 Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Sat, 21 Apr 2012 08:00:01 +0100 Subject: [PATCH 3/6] Adding llGetAgentList and related constants plus PRIM_SLICE. --- trunk/Resource/ConfLSL.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/trunk/Resource/ConfLSL.xml b/trunk/Resource/ConfLSL.xml index 02e7fcf..5195f74 100644 --- a/trunk/Resource/ConfLSL.xml +++ b/trunk/Resource/ConfLSL.xml @@ -708,8 +708,13 @@ string llGetAgentLanguage( key avatar ); - Returns a string that is the language code of the preferred - interface language of the user avatar. + Returns a string that is the language code of the preferred interface language of the user avatar. + + + + list llGetAgentList( integer Scope, list Options ); + + Returns a list of agents from the specified scope (parcel, owner's parcel, region). @@ -4662,6 +4667,10 @@ Constants that do not fit into any of the previously defined categories. + + + + @@ -4959,6 +4968,7 @@ + From fc7a8f22d5754c0c42b4ec05ad36871fd2bc311f Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Sat, 21 Apr 2012 08:00:43 +0100 Subject: [PATCH 4/6] Updating Release Notes --- trunk/LSLEditor.RES | Bin 84952 -> 85300 bytes trunk/Resource/ReleaseNotes.htm | 18 +++++++++++++++++- trunk/lsleditor.csproj | 9 ++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/trunk/LSLEditor.RES b/trunk/LSLEditor.RES index 34647d47ad3b1455909ca6f7c89de7d2ee3ce1bb..3f4c45d14303e3758a09240b900cf3acb8752dd1 100644 GIT binary patch delta 285 zcmcaHopsAB)(rNX*MFRw&6=aLmq51PUs+ z6jf%YYU5qiQ!L!WmQnlUp4LlYSg20WE{59Ji<(0TclP0002Dyd42} EFMab4KmY&$ diff --git a/trunk/Resource/ReleaseNotes.htm b/trunk/Resource/ReleaseNotes.htm index d447676..d6a4b98 100644 --- a/trunk/Resource/ReleaseNotes.htm +++ b/trunk/Resource/ReleaseNotes.htm @@ -8,7 +8,23 @@
-

<2012-04-00 - Release 2.46.0

+

<2012-04-23 - Release 2.46.0

+ * Added constants/function currently on the Magnum RC. +
+ * Constants: +
    +
  • AGENT_LIST_PARCEL
    • +
  • AGENT_LIST_PARCEL_OWNER
    • +
  • AGENT_LIST_REGION
    • +
  • PRIM_SLICE
    • +
+
+
+ * Functions: +
    +
  • llGetAgentList
    • +
+
* Fixed:
    diff --git a/trunk/lsleditor.csproj b/trunk/lsleditor.csproj index 4fefa0d..b556fec 100644 --- a/trunk/lsleditor.csproj +++ b/trunk/lsleditor.csproj @@ -12,7 +12,7 @@ LSLEditor - testing.pfx + lsl-editor.pfx JScript Grid IE50 @@ -94,6 +94,12 @@ prompt AllRules.ruleset + + true + + + 5CBB20152EC70EC13542B336790AF2E7AB2E1DEB + System @@ -717,6 +723,7 @@ + From f3aa4a752c6e5f4a41a01ca41dfc42b816b5d508 Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Sun, 22 Apr 2012 10:06:28 +0100 Subject: [PATCH 5/6] Adding lLGetAgentList/constants and PRIM_SLICE to code emulation. --- trunk/LSLEditor.RES | Bin 85300 -> 85656 bytes trunk/SecondLife/SecondLifeMain.cs | 11 +++++++++++ trunk/lsleditor.csproj | 3 +++ 3 files changed, 14 insertions(+) diff --git a/trunk/LSLEditor.RES b/trunk/LSLEditor.RES index 3f4c45d14303e3758a09240b900cf3acb8752dd1..6af5849ec8caedb654573f8ca2429e89589839dc 100644 GIT binary patch delta 282 zcmdloi*?3a)(r+y1N0)b6RW|zVX36p3bfa ssmZ%Lc_-V-aPy%#ZJLV8WNSB0=FH-f$s0SxK}wpPrMEjvGk!D#03VD^>i_@% delta 33 pcmbO+mvzf5)(rr3;X~8 diff --git a/trunk/SecondLife/SecondLifeMain.cs b/trunk/SecondLife/SecondLifeMain.cs index 2506f50..b7f8e88 100644 --- a/trunk/SecondLife/SecondLifeMain.cs +++ b/trunk/SecondLife/SecondLifeMain.cs @@ -230,6 +230,10 @@ namespace LSLEditor public static readonly integer AGENT_BY_LEGACY_NAME = 0x1; public static readonly integer AGENT_BY_USERNAME = 0x10; + public static readonly integer AGENT_LIST_PARCEL = 0x01; + public static readonly integer AGENT_LIST_PARCEL_OWNER = 0x02; + public static readonly integer AGENT_LIST_REGION = 0x04; + public static readonly integer ATTACH_CHEST = 1; public static readonly integer ATTACH_HEAD = 2; public static readonly integer ATTACH_LSHOULDER = 3; @@ -602,6 +606,7 @@ namespace LSLEditor public static readonly integer PRIM_SHINY_MEDIUM = 2; public static readonly integer PRIM_SHINY_NONE = 0; public static readonly integer PRIM_SIZE = 7; + public static readonly integer PRIM_SLICE = 35; public static readonly integer PRIM_TEMP_ON_REZ = 4; public static readonly integer PRIM_TEXGEN = 22; public static readonly integer PRIM_TEXGEN_DEFAULT = 0; @@ -1761,6 +1766,12 @@ namespace LSLEditor return strLan; } + public list llGetAgentList(integer Scope, list Options) + { + Verbose("llGetAgentList({0}, [{1}])", Scope, Options); + return new list(); + } + public vector llGetAgentSize(key id) { Verbose("GetAgentSize(" + id + ")"); diff --git a/trunk/lsleditor.csproj b/trunk/lsleditor.csproj index b556fec..dfa082e 100644 --- a/trunk/lsleditor.csproj +++ b/trunk/lsleditor.csproj @@ -234,6 +234,8 @@ + + @@ -724,6 +726,7 @@ + From 8bf516eb20ccc38842ee26dd16fe7816be1b4240 Mon Sep 17 00:00:00 2001 From: Ima Mechanique Date: Sun, 22 Apr 2012 10:12:28 +0100 Subject: [PATCH 6/6] Updating Relase Notes and version number --- trunk/Properties/AssemblyInfo.cs | 4 ++-- trunk/Resource/ReleaseNotes.htm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/Properties/AssemblyInfo.cs b/trunk/Properties/AssemblyInfo.cs index 105a890..0674a78 100644 --- a/trunk/Properties/AssemblyInfo.cs +++ b/trunk/Properties/AssemblyInfo.cs @@ -70,7 +70,7 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.45.1.*")] +[assembly: AssemblyVersion("2.46.0.*")] // // In order to sign your assembly you must specify a key to use. Refer to the @@ -100,4 +100,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyName("")] [assembly: ComVisibleAttribute(false)] -[assembly: AssemblyFileVersionAttribute("2.45.1.0")] +[assembly: AssemblyFileVersionAttribute("2.46.0.0")] diff --git a/trunk/Resource/ReleaseNotes.htm b/trunk/Resource/ReleaseNotes.htm index d6a4b98..e78e6ca 100644 --- a/trunk/Resource/ReleaseNotes.htm +++ b/trunk/Resource/ReleaseNotes.htm @@ -29,7 +29,7 @@ * Fixed:
    • SF ID: 3072580 - HTTP Request response returned gzip compressed string. (Thanks to Akkarin Dryke).
      • -
    • Also fixed HTTP Request response returning UTF-8 (instead of ASCII).
      • +
    • Also fixed HTTP Request response to return UTF-8 (instead of ASCII).