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

Merge branch 'dev-syntax-code' into dev-next

Browse source
This commit is contained in:
Ima Mechanique 2012-04-22 10:06:44 +01:00
commit cd65779486
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/LSLEditor.RES
View file

Binary file not shown.

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

3
trunk/lsleditor.csproj
View file

@ -234,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" />
@ -724,6 +726,7 @@
<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" />