rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adds non capps fallback

Browse source
This commit is contained in:
Madpeter 2025-09-06 23:27:32 +01:00
parent d74b2bc090
commit 6bd37c55d8
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
SecondBotEvents/Commands/Estate.cs
View file

@ -104,12 +104,6 @@ namespace SecondBotEvents.Commands
return Failure("Unable to process override environment value please use true or false", [sun_hour, is_sun_fixed, is_externally_visible, allow_direct_teleport, deny_anonymous, deny_age_unverified, block_bots, allow_voice_chat, override_public_access, override_environment]); return Failure("Unable to process override environment value please use true or false", [sun_hour, is_sun_fixed, is_externally_visible, allow_direct_teleport, deny_anonymous, deny_age_unverified, block_bots, allow_voice_chat, override_public_access, override_environment]);
} }
Uri uri = GetClient().Network.CurrentSim.Caps.CapabilityURI("EstateChangeInfo");
if (uri == null)
{
return new KeyValuePair<bool, string>(false, "Unable to get URI for EstateChangeInfo");
}
// Block inline and wait for the estate info reply to get the estate name // Block inline and wait for the estate info reply to get the estate name
string estatename = null; string estatename = null;
using (var waitHandle = new System.Threading.ManualResetEventSlim(false)) using (var waitHandle = new System.Threading.ManualResetEventSlim(false))
@ -137,6 +131,28 @@ namespace SecondBotEvents.Commands
{ {
return Failure("No estate info reply received"); return Failure("No estate info reply received");
} }
Uri uri = GetClient().Network.CurrentSim.Caps.CapabilityURI("EstateChangeInfo");
if (uri == null)
{
// try data server fallback
List<string> config = new List<string>();
config.Add(estatename);
Int64 bitmask = 0;
if (issunfixed) bitmask |= 1 << 4;
if (isexternallyvisible) bitmask |= 1 << 15;
if (allowdirectteleport) bitmask |= 1 << 20;
if (denyanonymous) bitmask |= 1 << 23;
if (denyageunverified) bitmask |= 1 << 30;
if (blockbots) bitmask |= 1 << 31;
if (allowvoicechat) bitmask |= 1 << 28;
if (overridepublicaccess) bitmask |= 1 << 5;
if (overrideenvironment) bitmask |= 1 << 9;
config.Add(bitmask.ToString());
config.Add((sunhourvalue * 1024.0f).ToString());
GetClient().Estate.EstateOwnerMessage("estatechangeinfo", config);
return BasicReply("ok using fallback", [sun_hour, is_sun_fixed, is_externally_visible, allow_direct_teleport, deny_anonymous, deny_age_unverified, block_bots, allow_voice_chat, override_public_access, override_environment]);
}
OSDMap body = new OSDMap(); OSDMap body = new OSDMap();
body["estate_name"] = estatename; body["estate_name"] = estatename;