corrects issues and fixs rez command
wiki make will no longer report negative args required for direct calls. Rez command updated to return UUID
This commit is contained in:
parent
f324f9d707
commit
a20c70d806
2 changed files with 20 additions and 3 deletions
|
|
@ -476,7 +476,12 @@ namespace BetterSecondBot.WikiMake
|
||||||
sb.Append(".html'>");
|
sb.Append(".html'>");
|
||||||
sb.Append(c);
|
sb.Append(c);
|
||||||
sb.Append("</a></td><td>");
|
sb.Append("</a></td><td>");
|
||||||
sb.Append((args-1).ToString());
|
int argcount = args - 1;
|
||||||
|
if(argcount < 0)
|
||||||
|
{
|
||||||
|
argcount = 0;
|
||||||
|
}
|
||||||
|
sb.Append(argcount.ToString());
|
||||||
sb.Append("</td></tr>");
|
sb.Append("</td></tr>");
|
||||||
}
|
}
|
||||||
sb.Append("</tbody></table>");
|
sb.Append("</tbody></table>");
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,9 @@ namespace BetterSecondBot.HttpService
|
||||||
public HTTP_Inventory(SecondBot mainbot, TokenStorage setuptokens) : base(mainbot, setuptokens) { }
|
public HTTP_Inventory(SecondBot mainbot, TokenStorage setuptokens) : base(mainbot, setuptokens) { }
|
||||||
|
|
||||||
[About("rezs the item at the bots current location")]
|
[About("rezs the item at the bots current location")]
|
||||||
[ReturnHints("True|False")]
|
[ReturnHints("UUID of rezzed item")]
|
||||||
|
[ReturnHints("Invaild item UUID")]
|
||||||
|
[ReturnHints("Unable to find item")]
|
||||||
[ArgHints("item", "URLARG", "UUID of item to rez")]
|
[ArgHints("item", "URLARG", "UUID of item to rez")]
|
||||||
[Route(HttpVerbs.Get, "/RezObject/{item}/{token}")]
|
[Route(HttpVerbs.Get, "/RezObject/{item}/{token}")]
|
||||||
public object RezObject(string item, string token)
|
public object RezObject(string item, string token)
|
||||||
|
|
@ -26,7 +28,17 @@ namespace BetterSecondBot.HttpService
|
||||||
{
|
{
|
||||||
return Failure("Token not accepted");
|
return Failure("Token not accepted");
|
||||||
}
|
}
|
||||||
return Failure("Broken awaiting repairs");
|
if (UUID.TryParse(item, out UUID targetitem) == true)
|
||||||
|
{
|
||||||
|
return Failure("Invaild item UUID");
|
||||||
|
}
|
||||||
|
InventoryItem itm = bot.GetClient.Inventory.FetchItem(targetitem, bot.GetClient.Self.AgentID, (5 * 1000));
|
||||||
|
if (itm == null)
|
||||||
|
{
|
||||||
|
return Failure("Unable to find item");
|
||||||
|
}
|
||||||
|
UUID rezedobject = bot.GetClient.Inventory.RequestRezFromInventory(bot.GetClient.Network.CurrentSim, bot.GetClient.Self.SimRotation, bot.GetClient.Self.RelativePosition, itm);
|
||||||
|
return BasicReply(rezedobject.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue