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

Merge branch 'dev-v3' into dev-v3-stub-audit

Browse source
This commit is contained in:
Ima Mechanique 2013-07-11 01:21:29 +01:00
commit ef91041a0c
7 changed files with 93 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

57
trunk/SecondLife/SecondLifeMain.cs
View file

@ -92,8 +92,18 @@ namespace LSLEditor
#endregion
#region constructor
public SecondLife()
#region Properties
public vector GetLocalPos
{
// TODO change this to use a call to llGetLocalPos specifying NOT to be Verbose. After all functions have been changed to allow verbose/silent option.
get { return m_pos; }
}
#endregion
#region constructor
public SecondLife()
{
host = null;
m_random = new Random();
@ -279,6 +289,7 @@ namespace LSLEditor
public const int ATTACH_HUD_BOTTOM = 37;
public const int ATTACH_HUD_BOTTOM_RIGHT = 38;
public const int AVOID_NONE = 0;
public const int AVOID_CHARACTERS = 1;
public const int AVOID_DYNAMIC_OBSTACLES = 2;
@ -466,6 +477,7 @@ namespace LSLEditor
public const int MASK_OWNER = 1;
public const int OBJECT_ATTACHED_POINT = 19;
public const int OBJECT_CHARACTER_TIME = 17;
public const int OBJECT_NAME = 1;
public const int OBJECT_DESC = 2;
public const int OBJECT_POS = 3;
@ -739,6 +751,8 @@ namespace LSLEditor
public const int PU_EVADE_HIDDEN = 0x07;
public const int PU_EVADE_SPOTTED = 0x08;
public const int PU_FAILURE_DYNAMIC_PATHFINDING_DISABLED = 10;
public const int PU_FAILURE_PARCEL_UNREACHABLE = 11;
public const int PU_FAILURE_INVALID_GOAL = 0x03;
public const int PU_FAILURE_INVALID_START = 0x02;
public const int PU_FAILURE_NO_VALID_DESTINATION = 0x06;
@ -2210,11 +2224,9 @@ namespace LSLEditor
return iLength;
}
public vector llGetLocalPos(Boolean bVerbose = true)
public vector llGetLocalPos()
{
if (bVerbose) {
Verbose("llGetLocalPos()={0}", m_pos);
}
Verbose("llGetLocalPos()={0}", m_pos);
return m_pos;
}
@ -2609,6 +2621,13 @@ namespace LSLEditor
return m_start_parameter;
}
public list llGetStaticPath(vector vStart, vector vEnd, Float fRadius, list lParameters)
{
list lReturn = new list();
Verbose("llGetStaticPath({0}, {1}, {2}, {3})={4}", vStart, vEnd, fRadius, lParameters.ToVerboseString(), lReturn.ToVerboseString());
return lReturn;
}
public integer llGetStatus(integer iRequestedStatus)
{
integer iStatus = 0;
@ -4482,10 +4501,24 @@ namespace LSLEditor
return vector.ZERO_VECTOR;
}
public String llXorBase64StringsCorrect(String s1, String s2)
public String llXorBase64(String sText1, String sText2)
{
string sResult = "";
Verbose(@"llXorBase64(""{0}"",""{1}"")=""{2}""", sText1, sText2, sResult);
return sResult;
}
public String llXorBase64Strings(String sText1, String sText2)
{
string sResult = "";
Verbose(@"llXorBase64Strings(""{0}"",""{1}"")=""{2}""", sText1, sText2, sResult);
return sResult;
}
public String llXorBase64StringsCorrect(String sText1, String sText2)
{
string S1 = Base64ToString(s1.ToString());
string S2 = Base64ToString(s2.ToString());
string S1 = Base64ToString(sText1.ToString());
string S2 = Base64ToString(sText2.ToString());
int intLength = S1.Length;
if (S2.Length == 0)
S2 = " ";
@ -4495,9 +4528,9 @@ namespace LSLEditor
StringBuilder sb = new StringBuilder();
for (int intI = 0; intI < intLength; intI++)
sb.Append((char)(S1[intI] ^ S2[intI]));
string result = StringToBase64(sb.ToString());
Verbose(@"llXorBase64StringsCorrect(""{0}"",""{1}"")=""{2}""", s1, s2, result);
return result;
string sResult = StringToBase64(sb.ToString());
Verbose(@"llXorBase64StringsCorrect(""{0}"",""{1}"")=""{2}""", sText1, sText2, sResult);
return sResult;
}
#endregion
}

14
trunk/SecondLife/json.cs
View file

@ -1,14 +0,0 @@
using System;
using System.Collections;
using System.Text;
namespace LSLEditor
{
public partial class SecondLife
{
public class jsonObject : DictionaryBase
{
}
}
}