ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

llMap* lookat does nothing

Browse Source
This commit is contained in:
UbitUmarov
2025-08-13 12:30:07 +01:00
parent be8b208bf5
commit 6edc1f962b
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/IClientAPI.cs
View File

@@ -1396,7 +1396,8 @@ namespace OpenSim.Framework
void SendRegionHandle(UUID regoinID, ulong handle);
void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y);
void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt, int options);
//void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt, int options);
void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, int options); //lookat does nothing
void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data);
void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data);

8
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -3683,15 +3683,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(reply, ThrottleOutPacketType.Land);
}
public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt, int options)
public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, int options)
{
ScriptTeleportRequestPacket packet = (ScriptTeleportRequestPacket)PacketPool.Instance.GetPacket(PacketType.ScriptTeleportRequest);
packet.Header.Zerocoded = true;
packet.Data.ObjectName = Utils.StringToBytes(objName);
packet.Data.SimName = Utils.StringToBytes(simName);
packet.Data.SimPosition = pos;
packet.Data.LookAt = lookAt;
packet.Options = [ new(){Flags = (uint)options } ];
packet.Data.LookAt = Vector3.Zero;
packet.Options = options == 3 ? [] : [ new(){Flags = (uint)options } ];
OutPacket(packet, ThrottleOutPacketType.Task);
}

2
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt, int options)
public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, int options)
{
}

2
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@@ -1181,7 +1181,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
return string.Empty;
}
public void SendScriptTeleportRequest (string objName, string simName, Vector3 pos, Vector3 lookAt, int options)
public void SendScriptTeleportRequest (string objName, string simName, Vector3 pos, int options)
{
}

7
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -13966,8 +13966,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
//lookat does nothing
avatar?.ControllingClient.SendScriptTeleportRequest(m_host.Name,
simname, pos, lookAt, ScriptBaseClass.BEACON_FOCUS_MAP | ScriptBaseClass.BEACON_SHOW_MAP);
simname, pos, ScriptBaseClass.BEACON_FOCUS_MAP | ScriptBaseClass.BEACON_SHOW_MAP);
ScriptSleep(m_sleepMsOnMapDestination);
}
@@ -14015,7 +14016,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (open_map != 0)
{
options =ScriptBaseClass.BEACON_SHOW_MAP;
options = ScriptBaseClass.BEACON_SHOW_MAP;
if (focus_map != 0)
options |= ScriptBaseClass.BEACON_FOCUS_MAP;
}
@@ -14031,7 +14032,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
avatar?.ControllingClient.SendScriptTeleportRequest(m_host.Name,
simname, pos, Vector3.UnitX, options);
simname, pos, options);
ScriptSleep(m_sleepMsOnMapDestination);
}