Thank you, Melanie for a patch that:

Patch fixes the pesky "Cannot implicitly convert to bool" issue for function returns
0.6.0-stable
Charles Krinke 2008-05-09 03:20:29 +00:00
parent 9f1c033757
commit 6ce00ce460
3 changed files with 129 additions and 129 deletions

View File

@ -187,7 +187,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llPow(fbase, fexponent);
}
public int llAbs(int i)
public LSL_Types.LSLInteger llAbs(int i)
{
return m_LSL_Functions.llAbs(i);
}
@ -202,17 +202,17 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llFrand(mag);
}
public int llFloor(double f)
public LSL_Types.LSLInteger llFloor(double f)
{
return m_LSL_Functions.llFloor(f);
}
public int llCeil(double f)
public LSL_Types.LSLInteger llCeil(double f)
{
return m_LSL_Functions.llCeil(f);
}
public int llRound(double f)
public LSL_Types.LSLInteger llRound(double f)
{
return m_LSL_Functions.llRound(f);
}
@ -290,7 +290,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llRegionSay(channelID, text);
}
public int llListen(int channelID, string name, string ID, string msg)
public LSL_Types.LSLInteger llListen(int channelID, string name, string ID, string msg)
{
return m_LSL_Functions.llListen(channelID, name, ID, msg);
}
@ -335,7 +335,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llDetectedOwner(number);
}
public int llDetectedType(int number)
public LSL_Types.LSLInteger llDetectedType(int number)
{
return m_LSL_Functions.llDetectedType(number);
}
@ -360,12 +360,12 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llDetectedRot(number);
}
public int llDetectedGroup(int number)
public LSL_Types.LSLInteger llDetectedGroup(int number)
{
return m_LSL_Functions.llDetectedGroup(number);
}
public int llDetectedLinkNumber(int number)
public LSL_Types.LSLInteger llDetectedLinkNumber(int number)
{
return m_LSL_Functions.llDetectedLinkNumber(number);
}
@ -398,7 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llSetStatus(status, value);
}
public int llGetStatus(int status)
public LSL_Types.LSLInteger llGetStatus(int status)
{
return m_LSL_Functions.llGetStatus(status);
}
@ -501,7 +501,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetForce();
}
public int llTarget(vector position, double range)
public LSL_Types.LSLInteger llTarget(vector position, double range)
{
return m_LSL_Functions.llTarget(position, range);
}
@ -511,7 +511,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llTargetRemove(number);
}
public int llRotTarget(rotation rot, double error)
public LSL_Types.LSLInteger llRotTarget(rotation rot, double error)
{
return m_LSL_Functions.llRotTarget(rot, error);
}
@ -672,7 +672,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llToLower(source);
}
public int llGiveMoney(string destination, int amount)
public LSL_Types.LSLInteger llGiveMoney(string destination, int amount)
{
return m_LSL_Functions.llGiveMoney(destination, amount);
}
@ -823,7 +823,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//
// DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
//
public int llStringLength(string str)
public LSL_Types.LSLInteger llStringLength(string str)
{
return m_LSL_Functions.llStringLength(str);
}
@ -853,7 +853,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llTargetOmega(axis, spinrate, gain);
}
public int llGetStartParameter()
public LSL_Types.LSLInteger llGetStartParameter()
{
return m_LSL_Functions.llGetStartParameter();
}
@ -873,12 +873,12 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetPermissionsKey();
}
public int llGetPermissions()
public LSL_Types.LSLInteger llGetPermissions()
{
return m_LSL_Functions.llGetPermissions();
}
public int llGetLinkNumber()
public LSL_Types.LSLInteger llGetLinkNumber()
{
return m_LSL_Functions.llGetLinkNumber();
}
@ -913,7 +913,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetLinkName(linknum);
}
public int llGetInventoryNumber(int type)
public LSL_Types.LSLInteger llGetInventoryNumber(int type)
{
return m_LSL_Functions.llGetInventoryNumber(type);
}
@ -1026,7 +1026,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetScriptName();
}
public int llGetNumberOfSides()
public LSL_Types.LSLInteger llGetNumberOfSides()
{
return m_LSL_Functions.llGetNumberOfSides();
}
@ -1094,7 +1094,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetTextureRot(side);
}
public int llSubStringIndex(string source, string pattern)
public LSL_Types.LSLInteger llSubStringIndex(string source, string pattern)
{
return m_LSL_Functions.llSubStringIndex(source, pattern);
}
@ -1114,7 +1114,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llListSort(src, stride, ascending);
}
public int llGetListLength(LSL_Types.list src)
public LSL_Types.LSLInteger llGetListLength(LSL_Types.list src)
{
return m_LSL_Functions.llGetListLength(src);
}
@ -1122,7 +1122,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//
// DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
//
public int llList2Integer(LSL_Types.list src, int index)
public LSL_Types.LSLInteger llList2Integer(LSL_Types.list src, int index)
{
return m_LSL_Functions.llList2Integer(src, index);
}
@ -1162,7 +1162,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llDeleteSubList(src, start, end);
}
public int llGetListEntryType(LSL_Types.list src, int index)
public LSL_Types.LSLInteger llGetListEntryType(LSL_Types.list src, int index)
{
return m_LSL_Functions.llGetListEntryType(src, index);
}
@ -1197,7 +1197,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llListInsertList(dest, src, start);
}
public int llListFindList(LSL_Types.list src, LSL_Types.list test)
public LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test)
{
return m_LSL_Functions.llListFindList(src, test);
}
@ -1217,12 +1217,12 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetDate();
}
public int llEdgeOfWorld(vector pos, vector dir)
public LSL_Types.LSLInteger llEdgeOfWorld(vector pos, vector dir)
{
return m_LSL_Functions.llEdgeOfWorld(pos, dir);
}
public int llGetAgentInfo(string id)
public LSL_Types.LSLInteger llGetAgentInfo(string id)
{
return m_LSL_Functions.llGetAgentInfo(id);
}
@ -1270,7 +1270,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llParseString2List(str,separators,spacers);
}
public int llOverMyLand(string id)
public LSL_Types.LSLInteger llOverMyLand(string id)
{
return m_LSL_Functions.llOverMyLand(id);
}
@ -1290,7 +1290,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetAgentSize(id);
}
public int llSameGroup(string agent)
public LSL_Types.LSLInteger llSameGroup(string agent)
{
return m_LSL_Functions.llSameGroup(agent);
}
@ -1315,12 +1315,12 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGroundContour(offset);
}
public int llGetAttached()
public LSL_Types.LSLInteger llGetAttached()
{
return m_LSL_Functions.llGetAttached();
}
public int llGetFreeMemory()
public LSL_Types.LSLInteger llGetFreeMemory()
{
return m_LSL_Functions.llGetFreeMemory();
}
@ -1433,7 +1433,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llDumpList2String(src, seperator);
}
public int llScriptDanger(vector pos)
public LSL_Types.LSLInteger llScriptDanger(vector pos)
{
return m_LSL_Functions.llScriptDanger(pos);
}
@ -1453,7 +1453,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llResetOtherScript(name);
}
public int llGetScriptState(string name)
public LSL_Types.LSLInteger llGetScriptState(string name)
{
return m_LSL_Functions.llGetScriptState(name);
}
@ -1585,7 +1585,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llSetLinkAlpha(linknumber, alpha, face);
}
public int llGetNumberOfPrims()
public LSL_Types.LSLInteger llGetNumberOfPrims()
{
return m_LSL_Functions.llGetNumberOfPrims();
}
@ -1618,7 +1618,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llIntegerToBase64(number);
}
public int llBase64ToInteger(string str)
public LSL_Types.LSLInteger llBase64ToInteger(string str)
{
return m_LSL_Functions.llBase64ToInteger(str);
}
@ -1648,7 +1648,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param);
}
public int llGetObjectPermMask(int mask)
public LSL_Types.LSLInteger llGetObjectPermMask(int mask)
{
return m_LSL_Functions.llGetObjectPermMask(mask);
}
@ -1658,7 +1658,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llSetObjectPermMask(mask, value);
}
public int llGetInventoryPermMask(string item, int mask)
public LSL_Types.LSLInteger llGetInventoryPermMask(string item, int mask)
{
return m_LSL_Functions.llGetInventoryPermMask(item, mask);
}
@ -1713,7 +1713,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llParcelMediaQuery();
}
public int llModPow(int a, int b, int c)
public LSL_Types.LSLInteger llModPow(int a, int b, int c)
{
return m_LSL_Functions.llModPow(a, b, c);
}
@ -1721,7 +1721,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//
// DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
//
public int llGetInventoryType(string name)
public LSL_Types.LSLInteger llGetInventoryType(string name)
{
return m_LSL_Functions.llGetInventoryType(name);
}
@ -1796,17 +1796,17 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llListStatistics(operation, src);
}
public int llGetUnixTime()
public LSL_Types.LSLInteger llGetUnixTime()
{
return m_LSL_Functions.llGetUnixTime();
}
public int llGetParcelFlags(vector pos)
public LSL_Types.LSLInteger llGetParcelFlags(vector pos)
{
return m_LSL_Functions.llGetParcelFlags(pos);
}
public int llGetRegionFlags()
public LSL_Types.LSLInteger llGetRegionFlags()
{
return m_LSL_Functions.llGetRegionFlags();
}
@ -1831,7 +1831,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llResetLandPassList();
}
public int llGetParcelPrimCount(vector pos, int category, int sim_wide)
public LSL_Types.LSLInteger llGetParcelPrimCount(vector pos, int category, int sim_wide)
{
return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide);
}
@ -1841,7 +1841,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetParcelPrimOwners(pos);
}
public int llGetObjectPrimCount(string object_id)
public LSL_Types.LSLInteger llGetObjectPrimCount(string object_id)
{
return m_LSL_Functions.llGetObjectPrimCount(object_id);
}
@ -1849,7 +1849,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//
// DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
//
public int llGetParcelMaxPrims(vector pos, int sim_wide)
public LSL_Types.LSLInteger llGetParcelMaxPrims(vector pos, int sim_wide)
{
return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide);
}

View File

@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return (double)Math.Pow(fbase, fexponent);
}
public int llAbs(int i)
public LSL_Types.LSLInteger llAbs(int i)
{
m_host.AddScriptLPS(1);
return (int)Math.Abs(i);
@ -246,20 +246,20 @@ namespace OpenSim.Region.ScriptEngine.Common
}
}
public int llFloor(double f)
public LSL_Types.LSLInteger llFloor(double f)
{
m_host.AddScriptLPS(1);
return (int)Math.Floor(f);
}
public int llCeil(double f)
public LSL_Types.LSLInteger llCeil(double f)
{
m_host.AddScriptLPS(1);
return (int)Math.Ceiling(f);
}
// Xantor 01/May/2008 fixed midpointrounding (2.5 becomes 3.0 instead of 2.0, default = ToEven)
public int llRound(double f)
public LSL_Types.LSLInteger llRound(double f)
{
m_host.AddScriptLPS(1);
return (int)Math.Round(f, MidpointRounding.AwayFromZero);
@ -502,7 +502,7 @@ namespace OpenSim.Region.ScriptEngine.Common
wComm.DeliverMessage(ChatTypeEnum.Region, channelID, m_host.Name, m_host.UUID, text);
}
public int llListen(int channelID, string name, string ID, string msg)
public LSL_Types.LSLInteger llListen(int channelID, string name, string ID, string msg)
{
m_host.AddScriptLPS(1);
LLUUID keyID;
@ -685,7 +685,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
public int llDetectedType(int number)
public LSL_Types.LSLInteger llDetectedType(int number)
{
m_host.AddScriptLPS(1);
EntityBase SensedObject = entityDetectedKey(number);
@ -744,14 +744,14 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Quaternion(SensedObject.Rotation.x, SensedObject.Rotation.y, SensedObject.Rotation.z, SensedObject.Rotation.w);
}
public int llDetectedGroup(int number)
public LSL_Types.LSLInteger llDetectedGroup(int number)
{
m_host.AddScriptLPS(1);
NotImplemented("llDetectedGroup");
return 0;
}
public int llDetectedLinkNumber(int number)
public LSL_Types.LSLInteger llDetectedLinkNumber(int number)
{
m_host.AddScriptLPS(1);
NotImplemented("llDetectedLinkNumber");
@ -852,7 +852,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return;
}
public int llGetStatus(int status)
public LSL_Types.LSLInteger llGetStatus(int status)
{
m_host.AddScriptLPS(1);
Console.WriteLine(m_host.UUID.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString());
@ -1331,7 +1331,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Vector3();
}
public int llTarget(LSL_Types.Vector3 position, double range)
public LSL_Types.LSLInteger llTarget(LSL_Types.Vector3 position, double range)
{
m_host.AddScriptLPS(1);
return m_host.registerTargetWaypoint(new LLVector3((float)position.x, (float)position.y, (float)position.z), (float)range);
@ -1344,7 +1344,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.unregisterTargetWaypoint(number);
}
public int llRotTarget(LSL_Types.Quaternion rot, double error)
public LSL_Types.LSLInteger llRotTarget(LSL_Types.Quaternion rot, double error)
{
m_host.AddScriptLPS(1);
NotImplemented("llRotTarget");
@ -1761,7 +1761,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return src.ToLower();
}
public int llGiveMoney(string destination, int amount)
public LSL_Types.LSLInteger llGiveMoney(string destination, int amount)
{
LLUUID invItemID=InventorySelf();
if (invItemID == LLUUID.Zero)
@ -2110,7 +2110,7 @@ namespace OpenSim.Region.ScriptEngine.Common
NotImplemented("llRotLookAt");
}
public int llStringLength(string str)
public LSL_Types.LSLInteger llStringLength(string str)
{
m_host.AddScriptLPS(1);
if (str.Length > 0)
@ -2201,7 +2201,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.SendTerseUpdateToAllClients();
}
public int llGetStartParameter()
public LSL_Types.LSLInteger llGetStartParameter()
{
m_host.AddScriptLPS(1);
NotImplemented("llGetStartParameter");
@ -2332,7 +2332,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return LLUUID.Zero.ToString();
}
public int llGetPermissions()
public LSL_Types.LSLInteger llGetPermissions()
{
m_host.AddScriptLPS(1);
@ -2347,7 +2347,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return 0;
}
public int llGetLinkNumber()
public LSL_Types.LSLInteger llGetLinkNumber()
{
m_host.AddScriptLPS(1);
@ -2505,7 +2505,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
}
public int llGetInventoryNumber(int type)
public LSL_Types.LSLInteger llGetInventoryNumber(int type)
{
m_host.AddScriptLPS(1);
int count = 0;
@ -2889,7 +2889,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
public int llGetNumberOfSides()
public LSL_Types.LSLInteger llGetNumberOfSides()
{
m_host.AddScriptLPS(1);
NotImplemented("llGetNumberOfSides");
@ -3112,7 +3112,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return tex.GetFace((uint)face).Rotation;
}
public int llSubStringIndex(string source, string pattern)
public LSL_Types.LSLInteger llSubStringIndex(string source, string pattern)
{
m_host.AddScriptLPS(1);
return source.IndexOf(pattern);
@ -3145,13 +3145,13 @@ namespace OpenSim.Region.ScriptEngine.Common
return src.Sort(stride, ascending);
}
public int llGetListLength(LSL_Types.list src)
public LSL_Types.LSLInteger llGetListLength(LSL_Types.list src)
{
m_host.AddScriptLPS(1);
return src.Length;
}
public int llList2Integer(LSL_Types.list src, int index)
public LSL_Types.LSLInteger llList2Integer(LSL_Types.list src, int index)
{
m_host.AddScriptLPS(1);
if (index < 0)
@ -3288,7 +3288,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return src.DeleteSublist(end, start);
}
public int llGetListEntryType(LSL_Types.list src, int index)
public LSL_Types.LSLInteger llGetListEntryType(LSL_Types.list src, int index)
{
m_host.AddScriptLPS(1);
if (index < 0)
@ -3628,7 +3628,7 @@ namespace OpenSim.Region.ScriptEngine.Common
/// in src.
/// </summary>
public int llListFindList(LSL_Types.list src, LSL_Types.list test)
public LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test)
{
int index = -1;
@ -3681,14 +3681,14 @@ namespace OpenSim.Region.ScriptEngine.Common
return result;
}
public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir)
public LSL_Types.LSLInteger llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir)
{
m_host.AddScriptLPS(1);
NotImplemented("llEdgeOfWorld");
return 0;
}
public int llGetAgentInfo(string id)
public LSL_Types.LSLInteger llGetAgentInfo(string id)
{
m_host.AddScriptLPS(1);
NotImplemented("llGetAgentInfo");
@ -3818,7 +3818,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return ret;
}
public int llOverMyLand(string id)
public LSL_Types.LSLInteger llOverMyLand(string id)
{
m_host.AddScriptLPS(1);
@ -3862,7 +3862,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Vector3();
}
public int llSameGroup(string agent)
public LSL_Types.LSLInteger llSameGroup(string agent)
{
m_host.AddScriptLPS(1);
NotImplemented("llSameGroup");
@ -3933,14 +3933,14 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Vector3();
}
public int llGetAttached()
public LSL_Types.LSLInteger llGetAttached()
{
m_host.AddScriptLPS(1);
NotImplemented("llGetAttached");
return 0;
}
public int llGetFreeMemory()
public LSL_Types.LSLInteger llGetFreeMemory()
{
m_host.AddScriptLPS(1);
NotImplemented("llGetFreeMemory");
@ -4300,7 +4300,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return ret;
}
public int llScriptDanger(LSL_Types.Vector3 pos)
public LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos)
{
m_host.AddScriptLPS(1);
bool result = World.scriptDanger(m_host.LocalId, new LLVector3((float)pos.x, (float)pos.y, (float)pos.z));
@ -4386,7 +4386,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
public int llGetScriptState(string name)
public LSL_Types.LSLInteger llGetScriptState(string name)
{
LLUUID item;
@ -4805,7 +4805,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
}
public int llGetNumberOfPrims()
public LSL_Types.LSLInteger llGetNumberOfPrims()
{
m_host.AddScriptLPS(1);
return m_host.ParentGroup.PrimCount;
@ -5201,7 +5201,7 @@ namespace OpenSim.Region.ScriptEngine.Common
// </para>
// </remarks>
public int llBase64ToInteger(string str)
public LSL_Types.LSLInteger llBase64ToInteger(string str)
{
int number = 0;
@ -5463,7 +5463,7 @@ namespace OpenSim.Region.ScriptEngine.Common
NotImplemented("llRezAtRoot");
}
public int llGetObjectPermMask(int mask)
public LSL_Types.LSLInteger llGetObjectPermMask(int mask)
{
m_host.AddScriptLPS(1);
@ -5527,7 +5527,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
}
public int llGetInventoryPermMask(string item, int mask)
public LSL_Types.LSLInteger llGetInventoryPermMask(string item, int mask)
{
m_host.AddScriptLPS(1);
foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
@ -5711,7 +5711,7 @@ namespace OpenSim.Region.ScriptEngine.Common
NotImplemented("llParcelMediaQuery");
}
public int llModPow(int a, int b, int c)
public LSL_Types.LSLInteger llModPow(int a, int b, int c)
{
m_host.AddScriptLPS(1);
Int64 tmp = 0;
@ -5719,7 +5719,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return Convert.ToInt32(tmp);
}
public int llGetInventoryType(string name)
public LSL_Types.LSLInteger llGetInventoryType(string name)
{
m_host.AddScriptLPS(1);
foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
@ -5911,19 +5911,19 @@ namespace OpenSim.Region.ScriptEngine.Common
}
}
public int llGetUnixTime()
public LSL_Types.LSLInteger llGetUnixTime()
{
m_host.AddScriptLPS(1);
return Util.UnixTimeSinceEpoch();
}
public int llGetParcelFlags(LSL_Types.Vector3 pos)
public LSL_Types.LSLInteger llGetParcelFlags(LSL_Types.Vector3 pos)
{
m_host.AddScriptLPS(1);
return (int)World.LandChannel.GetLandObject((float)pos.x, (float)pos.y).landData.landFlags;
}
public int llGetRegionFlags()
public LSL_Types.LSLInteger llGetRegionFlags()
{
m_host.AddScriptLPS(1);
return (int)World.RegionInfo.EstateSettings.regionFlags;
@ -6003,7 +6003,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
}
public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide)
public LSL_Types.LSLInteger llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide)
{
m_host.AddScriptLPS(1);
@ -6082,7 +6082,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return ret;
}
public int llGetObjectPrimCount(string object_id)
public LSL_Types.LSLInteger llGetObjectPrimCount(string object_id)
{
m_host.AddScriptLPS(1);
SceneObjectPart part = World.GetSceneObjectPart(new LLUUID(object_id));
@ -6096,7 +6096,7 @@ namespace OpenSim.Region.ScriptEngine.Common
}
}
public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide)
public LSL_Types.LSLInteger llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide)
{
m_host.AddScriptLPS(1);
// Alondria: This currently just is utilizing the normal grid's 0.22 prims/m2 calculation

View File

@ -43,12 +43,12 @@ namespace OpenSim.Region.ScriptEngine.Common
double llAtan2(double x, double y);
double llSqrt(double f);
double llPow(double fbase, double fexponent);
int llAbs(int i);
LSL_Types.LSLInteger llAbs(int i);
double llFabs(double f);
double llFrand(double mag);
int llFloor(double f);
int llCeil(double f);
int llRound(double f);
LSL_Types.LSLInteger llFloor(double f);
LSL_Types.LSLInteger llCeil(double f);
LSL_Types.LSLInteger llRound(double f);
double llVecMag(LSL_Types.Vector3 v);
LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v);
double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b);
@ -64,7 +64,7 @@ namespace OpenSim.Region.ScriptEngine.Common
void llSay(int channelID, string text);
void llShout(int channelID, string text);
void llRegionSay(int channelID, string text);
int llListen(int channelID, string name, string ID, string msg);
LSL_Types.LSLInteger llListen(int channelID, string name, string ID, string msg);
void llListenControl(int number, int active);
void llListenRemove(int number);
void llSensor(string name, string id, int type, double range, double arc);
@ -73,19 +73,19 @@ namespace OpenSim.Region.ScriptEngine.Common
string llDetectedName(int number);
string llDetectedKey(int number);
string llDetectedOwner(int number);
int llDetectedType(int number);
LSL_Types.LSLInteger llDetectedType(int number);
LSL_Types.Vector3 llDetectedPos(int number);
LSL_Types.Vector3 llDetectedVel(int number);
LSL_Types.Vector3 llDetectedGrab(int number);
LSL_Types.Quaternion llDetectedRot(int number);
int llDetectedGroup(int number);
int llDetectedLinkNumber(int number);
LSL_Types.LSLInteger llDetectedGroup(int number);
LSL_Types.LSLInteger llDetectedLinkNumber(int number);
void llDie();
double llGround(LSL_Types.Vector3 offset);
double llCloud(LSL_Types.Vector3 offset);
LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset);
void llSetStatus(int status, int value);
int llGetStatus(int status);
LSL_Types.LSLInteger llGetStatus(int status);
void llSetScale(LSL_Types.Vector3 scale);
LSL_Types.Vector3 llGetScale();
void llSetColor(LSL_Types.Vector3 color, int face);
@ -114,11 +114,11 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: vector llGetForce()
LSL_Types.Vector3 llGetForce();
//wiki: integer llTarget(vector position, double range)
int llTarget(LSL_Types.Vector3 position, double range);
LSL_Types.LSLInteger llTarget(LSL_Types.Vector3 position, double range);
//wiki: llTargetRemove(integer number)
void llTargetRemove(int number);
//wiki: integer llRotTarget(rotation rot, double error)
int llRotTarget(LSL_Types.Quaternion rot, double error);
LSL_Types.LSLInteger llRotTarget(LSL_Types.Quaternion rot, double error);
//wiki: integer llRotTargetRemove(integer number)
void llRotTargetRemove(int number);
//wiki: llMoveToTarget(vector target, double tau)
@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: string llToLower(string source)
string llToLower(string source);
//wiki: integer llGiveMoney(key destination, integer amount)
int llGiveMoney(string destination, int amount);
LSL_Types.LSLInteger llGiveMoney(string destination, int amount);
//wiki: (deprecated)
void llMakeExplosion();
//wiki: (deprecated)
@ -238,7 +238,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: llRotLookAt(rotation target, double strength, double damping)
void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping);
//wiki: integer llStringLength(string str)
int llStringLength(string str);
LSL_Types.LSLInteger llStringLength(string str);
//wiki: llStartAnimation(string anim)
void llStartAnimation(string anim);
//wiki: llStopAnimation(string anim)
@ -250,7 +250,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: llTargetOmega(vector axis, double spinrate, double gain)
void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain);
//wiki: integer llGetStartParameter()
int llGetStartParameter();
LSL_Types.LSLInteger llGetStartParameter();
//wiki: llGodLikeRezObject(key inventory, vector pos)
void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos);
//wiki: llRequestPermissions(key agent, integer perm)
@ -258,9 +258,9 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: key llGetPermissionsKey()
string llGetPermissionsKey();
//wiki: integer llGetPermissions()
int llGetPermissions();
LSL_Types.LSLInteger llGetPermissions();
//wiki integer llGetLinkNumber()
int llGetLinkNumber();
LSL_Types.LSLInteger llGetLinkNumber();
//wiki: llSetLinkColor(integer linknumber, vector color, integer face)
void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face);
//wiki: llCreateLink(key target, integer parent)
@ -274,7 +274,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: llGetLinkName(integer linknum)
string llGetLinkName(int linknum);
//wiki: integer llGetInventoryNumber(integer type)
int llGetInventoryNumber(int type);
LSL_Types.LSLInteger llGetInventoryNumber(int type);
//wiki: string llGetInventoryName(integer type, integer number)
string llGetInventoryName(int type, int number);
//wiki: llSetScriptState(string name, integer run)
@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: string llGetScriptName()
string llGetScriptName();
//wiki: integer llGetNumberOfSides()
int llGetNumberOfSides();
LSL_Types.LSLInteger llGetNumberOfSides();
//wiki: rotation llAxisAngle2Rot(vector axis, double angle)
LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle);
//wiki: vector llRot2Axis(rotation rot)
@ -344,7 +344,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: double llGetTextureRot(integer side)
double llGetTextureRot(int side);
//wiki: integer llSubStringIndex(string source, string pattern)
int llSubStringIndex(string source, string pattern);
LSL_Types.LSLInteger llSubStringIndex(string source, string pattern);
//wiki: key llGetOwnerKey(key id)
string llGetOwnerKey(string id);
//wiki: vector llGetCenterOfMass()
@ -352,9 +352,9 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: list llListSort(list src, integer stride, integer ascending)
LSL_Types.list llListSort(LSL_Types.list src, int stride, int ascending);
//integer llGetListLength(list src)
int llGetListLength(LSL_Types.list src);
LSL_Types.LSLInteger llGetListLength(LSL_Types.list src);
//wiki: integer llList2Integer(list src, integer index)
int llList2Integer(LSL_Types.list src, int index);
LSL_Types.LSLInteger llList2Integer(LSL_Types.list src, int index);
//wiki: double llList2double(list src, integer index)
double llList2Float(LSL_Types.list src, int index);
double osList2Double(LSL_Types.list src, int index);
@ -371,7 +371,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: llDeleteSubList(list src, integer start, integer end)
LSL_Types.list llDeleteSubList(LSL_Types.list src, int start, int end);
//wiki: integer llGetListEntryType( list src, integer index )
int llGetListEntryType(LSL_Types.list src, int index);
LSL_Types.LSLInteger llGetListEntryType(LSL_Types.list src, int index);
//wiki: string llList2CSV( list src )
string llList2CSV(LSL_Types.list src);
//wiki: list llCSV2List( string src )
@ -385,7 +385,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: list llListInsertList( list dest, list src, integer start )
LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int start);
//wiki: integer llListFindList( list src, list test )
int llListFindList(LSL_Types.list src, LSL_Types.list test);
LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test);
//wiki: string llGetObjectName()
string llGetObjectName();
//wiki: llSetObjectName(string name)
@ -393,9 +393,9 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: string llGetDate()
string llGetDate();
//wiki: integer llEdgeOfWorld(vector pos, vector dir)
int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir);
LSL_Types.LSLInteger llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir);
//wiki: integer llGetAgentInfo(key id)
int llGetAgentInfo(string id);
LSL_Types.LSLInteger llGetAgentInfo(string id);
//wiki: llAdjustSoundVolume(double volume)
void llAdjustSoundVolume(double volume);
//wiki: llSetSoundQueueing(integer queue)
@ -414,7 +414,7 @@ namespace OpenSim.Region.ScriptEngine.Common
void llEjectFromLand(string pest);
LSL_Types.list llParseString2List(string str, LSL_Types.list separators, LSL_Types.list spacers);
//wiki: integer llOverMyLand(key id)
int llOverMyLand(string id);
LSL_Types.LSLInteger llOverMyLand(string id);
//wiki: key llGetLandOwnerAt(vector pos)
string llGetLandOwnerAt(LSL_Types.Vector3 pos);
//wiki: key llGetNotecardLine(string name, integer line)
@ -422,7 +422,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: vector llGetAgentSize(key id)
LSL_Types.Vector3 llGetAgentSize(string id);
//wiki: integer llSameGroup(key agent)
int llSameGroup(string agent);
LSL_Types.LSLInteger llSameGroup(string agent);
//wiki: llUnSit(key id)
void llUnSit(string id);
//wiki: vector llGroundSlope(vector offset)
@ -432,9 +432,9 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: vector llGroundContour(vector offset)
LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset);
//wiki: integer llGetAttached()
int llGetAttached();
LSL_Types.LSLInteger llGetAttached();
//wiki: integer llGetFreeMemory()
int llGetFreeMemory();
LSL_Types.LSLInteger llGetFreeMemory();
//wiki: string llGetRegionName()
string llGetRegionName();
//wiki: double llGetRegionTimeDilation()
@ -477,7 +477,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//
string llDumpList2String(LSL_Types.list src, string seperator);
//wiki: integer llScriptDanger(vector pos)
int llScriptDanger(LSL_Types.Vector3 pos);
LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos);
//wiki: llDialog( key avatar, string message, list buttons, integer chat_channel )
void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel);
//wiki: llVolumeDetect(integer detect)
@ -485,7 +485,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: llResetOtherScript(string name)
void llResetOtherScript(string name);
//wiki: integer llGetScriptState(string name)
int llGetScriptState(string name);
LSL_Types.LSLInteger llGetScriptState(string name);
//wiki: (deprecated)
void llRemoteLoadScript();
//wiki: llSetRemoteScriptAccessPin(integer pin)
@ -537,7 +537,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: llSetLinkAlpha(integer linknumber, double alpha, integer face)
void llSetLinkAlpha(int linknumber, double alpha, int face);
//wiki: integer llGetNumberOfPrims()
int llGetNumberOfPrims();
LSL_Types.LSLInteger llGetNumberOfPrims();
//wiki: key llGetNumberOfNotecardLines(string name)
string llGetNumberOfNotecardLines(string name);
//wiki: list llGetBoundingBox( key object )
@ -549,7 +549,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: string llIntegerToBase64(integer number)
string llIntegerToBase64(int number);
//wiki integer llBase64ToInteger(string str)
int llBase64ToInteger(string str);
LSL_Types.LSLInteger llBase64ToInteger(string str);
//wiki: double llGetGMTclock()
double llGetGMTclock();
//wiki: string llGetSimulatorHostname()
@ -563,11 +563,11 @@ namespace OpenSim.Region.ScriptEngine.Common
LSL_Types.Quaternion rot, int param);
//wiki: integer llGetObjectPermMask(integer mask)
int llGetObjectPermMask(int mask);
LSL_Types.LSLInteger llGetObjectPermMask(int mask);
//wiki: llSetObjectPermMask(integer mask, integer value)
void llSetObjectPermMask(int mask, int value);
//wiki integer llGetInventoryPermMask(string item, integer mask)
int llGetInventoryPermMask(string item, int mask);
LSL_Types.LSLInteger llGetInventoryPermMask(string item, int mask);
//wiki: llSetInventoryPermMask(string item, integer mask, integer value)
void llSetInventoryPermMask(string item, int mask, int value);
//wiki: key llGetInventoryCreator(string item)
@ -587,9 +587,9 @@ namespace OpenSim.Region.ScriptEngine.Common
void llParcelMediaCommandList(LSL_Types.list commandList);
void llParcelMediaQuery();
//wiki integer llModPow(integer a, integer b, integer c)
int llModPow(int a, int b, int c);
LSL_Types.LSLInteger llModPow(int a, int b, int c);
//wiki: integer llGetInventoryType(string name)
int llGetInventoryType(string name);
LSL_Types.LSLInteger llGetInventoryType(string name);
//wiki: llSetPayPrice( integer price, list quick_pay_buttons )
void llSetPayPrice(int price, LSL_Types.list quick_pay_buttons);
//wiki: vector llGetCameraPos()
@ -619,11 +619,11 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: double llListStatistics( integer operation, list src )
double llListStatistics(int operation, LSL_Types.list src);
//wiki: integer llGetUnixTime()
int llGetUnixTime();
LSL_Types.LSLInteger llGetUnixTime();
//wiki: integer llGetParcelFlags(vector pos)
int llGetParcelFlags(LSL_Types.Vector3 pos);
LSL_Types.LSLInteger llGetParcelFlags(LSL_Types.Vector3 pos);
//wiki: integer llGetRegionFlags()
int llGetRegionFlags();
LSL_Types.LSLInteger llGetRegionFlags();
//wiki: string llXorBase64StringsCorrect(string str1, string str2)
string llXorBase64StringsCorrect(string str1, string str2);
string llHTTPRequest(string url, LSL_Types.list parameters, string body);
@ -632,13 +632,13 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: llResetLandPassList()
void llResetLandPassList();
//wiki: integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide);
LSL_Types.LSLInteger llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide);
//wiki: list llGetParcelPrimOwners( vector pos )
LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos);
//wiki: integer llGetObjectPrimCount(key object_id)
int llGetObjectPrimCount(string object_id);
LSL_Types.LSLInteger llGetObjectPrimCount(string object_id);
//wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide )
int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide);
LSL_Types.LSLInteger llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide);
//wiki: llGetParcelDetails(vector pos, list params)
LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param);
//wiki: llSetLinkTexture(integer linknumber, string texture, integer face )