Merge branch 'dev-next'
This commit is contained in:
Ima Mechanique
commit
ef1d710170
10 changed files with 108 additions and 35 deletions
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -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")]
|
||||
|
|
|
|||
4
trunk/Properties/Settings.Designer.cs
generated
4
trunk/Properties/Settings.Designer.cs
generated
|
|
@ -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"]));
|
||||
|
|
|
|||
|
|
@ -708,8 +708,13 @@
|
|||
<Word name="llGetAgentLanguage">
|
||||
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.
|
||||
</Word>
|
||||
|
||||
<Word name="llGetAgentList">
|
||||
list llGetAgentList( integer Scope, list Options );
|
||||
|
||||
Returns a list of agents from the specified scope (parcel, owner's parcel, region).
|
||||
</Word>
|
||||
|
||||
<Word name="llGetAgentSize">
|
||||
|
|
@ -4662,6 +4667,10 @@
|
|||
|
||||
<WordsSubsection name="C.99. Miscellaneous constants.">
|
||||
Constants that do not fit into any of the previously defined categories.
|
||||
<Word name="AGENT_LIST_PARCEL" />
|
||||
<Word name="AGENT_LIST_PARCEL_OWNER" />
|
||||
<Word name="AGENT_LIST_REGION" />
|
||||
|
||||
<Word name="CAMERA_ACTIVE" />
|
||||
<Word name="CAMERA_BEHINDNESS_ANGLE" />
|
||||
<Word name="CAMERA_BEHINDNESS_LAG" />
|
||||
|
|
@ -4959,6 +4968,7 @@
|
|||
<Word name="PRIM_SHINY_NONE" />
|
||||
|
||||
<Word name="PRIM_SIZE" />
|
||||
<Word name="PRIM_SLICE" />
|
||||
<Word name="PRIM_TEMP_ON_REZ" />
|
||||
|
||||
<Word name="PRIM_TEXGEN" />
|
||||
|
|
|
|||
|
|
@ -7,9 +7,35 @@
|
|||
</head>
|
||||
<body style="background-color: white; font-family: Verdana, sans-serif;font-size: 13px;line-height: 1.3">
|
||||
<div>
|
||||
<div>
|
||||
<h3><span class="date"><2012-04-23</span> - Release 2.46.0</h3>
|
||||
* Added constants/function currently on the Magnum RC.
|
||||
<div>
|
||||
* Constants:
|
||||
<ul>
|
||||
<li>AGENT_LIST_PARCEL</li>
|
||||
<li>AGENT_LIST_PARCEL_OWNER</li>
|
||||
<li>AGENT_LIST_REGION</li>
|
||||
<li>PRIM_SLICE</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
* Functions:
|
||||
<ul>
|
||||
<li>llGetAgentList</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
* Fixed:
|
||||
<ul>
|
||||
<li>SF ID: 3072580 - HTTP Request response returned gzip compressed string. (Thanks to Akkarin Dryke).</li>
|
||||
<li>Also fixed HTTP Request response to return UTF-8 (instead of ASCII).</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<h3><span class="date">2012-03-18</span> - Release 2.45.1</h3>
|
||||
<div>- Fixed: Problem with updater. Our BZip2 decompression code did not work, which prevented the updater creating the new file.</div>
|
||||
<div>* Fixed: Problem with updater. Our BZip2 decompression code did not work, which prevented the updater creating the new file.</div>
|
||||
</div>
|
||||
<div>
|
||||
<h3><span class="date">2012-03-14</span> - Release 2.45.0</h3>
|
||||
|
|
|
|||
|
|
@ -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 + ")");
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
||||
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
|
||||
</sectionGroup>
|
||||
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
<section name="LSLEditor.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<userSettings>
|
||||
|
|
@ -18,7 +17,7 @@
|
|||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="AvatarKey" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="RegionName" serializeAs="String">
|
||||
<value>LSLEditor Island</value>
|
||||
|
|
@ -30,13 +29,13 @@
|
|||
<value>youraddress@yourdomain.ext</value>
|
||||
</setting>
|
||||
<setting name="ProxyServer" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="ProxyUserid" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="ProxyPassword" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="BrowserLocation" serializeAs="String">
|
||||
<value>0, 0</value>
|
||||
|
|
@ -123,10 +122,10 @@
|
|||
<value>True</value>
|
||||
</setting>
|
||||
<setting name="SmtpUserid" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="SmtpPassword" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="SmtpAuth" serializeAs="String">
|
||||
<value>PLAIN</value>
|
||||
|
|
@ -138,13 +137,13 @@
|
|||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="CVSEXE" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="CVSROOT" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="ProjectLocation" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="DeleteOldFiles" serializeAs="String">
|
||||
<value>False</value>
|
||||
|
|
@ -177,19 +176,19 @@
|
|||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="SvnExe" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="SvnUserid" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="SvnPassword" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="ShowSolutionExplorer" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="WorkingDirectory" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
<setting name="XSecondLifeShard" serializeAs="String">
|
||||
<value>Production</value>
|
||||
|
|
@ -316,8 +315,8 @@
|
|||
<value>http://metaversegames.net/questions/lsl</value>
|
||||
</setting>
|
||||
<setting name="svnloc" serializeAs="String">
|
||||
<value />
|
||||
<value/>
|
||||
</setting>
|
||||
</LSLEditor.Properties.Settings>
|
||||
</applicationSettings>
|
||||
</configuration>
|
||||
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<AssemblyKeyContainerName>
|
||||
</AssemblyKeyContainerName>
|
||||
<AssemblyName>LSLEditor</AssemblyName>
|
||||
<AssemblyOriginatorKeyFile>testing.pfx</AssemblyOriginatorKeyFile>
|
||||
<AssemblyOriginatorKeyFile>lsl-editor.pfx</AssemblyOriginatorKeyFile>
|
||||
<DefaultClientScript>JScript</DefaultClientScript>
|
||||
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
|
||||
<DefaultTargetSchema>IE50</DefaultTargetSchema>
|
||||
|
|
@ -43,7 +43,8 @@
|
|||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<OutputPath>..\bin\Debug\</OutputPath>
|
||||
|
|
@ -93,6 +94,12 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignManifests>true</SignManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ManifestCertificateThumbprint>5CBB20152EC70EC13542B336790AF2E7AB2E1DEB</ManifestCertificateThumbprint>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System">
|
||||
<Name>System</Name>
|
||||
|
|
@ -227,6 +234,8 @@
|
|||
<Compile Include="Docking\Win32\Enums.cs" />
|
||||
<Compile Include="Docking\Win32\NativeMethods.cs" />
|
||||
<Compile Include="Editor\KeyWords.cs" />
|
||||
<None Include="582fd361b0616b6aa0b38e7cd7a80475.pem" />
|
||||
<None Include="Certum-OS-Certificate.pfx" />
|
||||
<None Include="Editor\RoundCorners.cs" />
|
||||
<Compile Include="Decompressor\Decompress.cs" />
|
||||
<Compile Include="Editor\MsXsltContext.cs" />
|
||||
|
|
@ -716,6 +725,8 @@
|
|||
<Content Include="LSLEditor.rc" />
|
||||
<EmbeddedResource Include="Resource\ToolsOptions.xml" />
|
||||
<EmbeddedResource Include="Resource\thanks.gif" />
|
||||
<None Include="lsl-editor.pfx" />
|
||||
<None Include="Open Source Developer.cer" />
|
||||
<None Include="Test.snk" />
|
||||
<None Include="testing.pfx" />
|
||||
<None Include="Web References\org.lsleditor.www\Service1.disco" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue