OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mantis#1925. Thank you, homerHorwitz for a patch that: 

This fixes the coordinates returned by doing a 
llRequestInventoryData on a landmark.
0.6.0-stable
Charles Krinke 2008-08-13 14:06:21 +00:00
parent 4f8f89a215
commit 6ccb9948ab
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -2986,7 +2986,36 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llRequestInventoryData(string name)
{
m_host.AddScriptLPS(1);
NotImplemented("llRequestInventoryData");
foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
{
if (item.Type == 3 && item.Name == name)
{
LLUUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest(
m_localID, m_itemID, item.AssetID.ToString());
LLVector3 region = new LLVector3(
World.RegionInfo.RegionLocX * Constants.RegionSize,
World.RegionInfo.RegionLocY * Constants.RegionSize,
0);
World.AssetCache.GetAsset(item.AssetID,
delegate(LLUUID i, AssetBase a)
{
AssetLandmark lm = new AssetLandmark(a);
float rx = (uint)(lm.RegionHandle >> 32);
float ry = (uint)lm.RegionHandle;
region = lm.Position + new LLVector3(rx, ry, 0) - region;
string reply = region.ToString();
m_ScriptEngine.m_ASYNCLSLCommandManager.
m_Dataserver.DataserverReply(i.ToString(),
reply);
}, false);
return tid.ToString();
}
}
return String.Empty;
}

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

@ -2917,10 +2917,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
AssetLandmark lm = new AssetLandmark(a);
region += lm.Position;
float rx = (uint)(lm.RegionHandle >> 32);
float ry = (uint)lm.RegionHandle;
region = lm.Position + new LLVector3(rx, ry, 0) - region;
string reply = region.ToString();
AsyncCommands.
DataserverPlugin.DataserverReply(i.ToString(),
reply);