AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bug-SF-3489102

Browse source
This commit is contained in:
Ima Mechanique 2012-04-22 10:14:59 +01:00
commit 7d4b51e5ff
6 changed files with 54 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/LSLEditor.RES
View file

Binary file not shown.

4
trunk/Properties/AssemblyInfo.cs
View file

@ -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")]

14
trunk/Resource/ConfLSL.xml
View file

@ -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" />

20
trunk/Resource/ReleaseNotes.htm
View file

@ -8,12 +8,28 @@
<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-00</span> - Release 2.46.0</h3>
<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 returning UTF-8 (instead of ASCII).</li>
<li>Also fixed HTTP Request response to return UTF-8 (instead of ASCII).</li>
</ul>
</div>
</div>

11
trunk/SecondLife/SecondLifeMain.cs
View file

@ -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 + ")");

12
trunk/lsleditor.csproj
View file

@ -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>
@ -94,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>
@ -228,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" />
@ -717,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" />