diff options
author | Justin Clark-Casey (justincc) | 2012-10-06 02:34:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-06 02:34:49 +0100 |
commit | 16c9c1dff7bbf299efddd44e4f9aeeb7db38fff6 (patch) | |
tree | affb51dd09432b08673ec0201f24f87e9f61797e /OpenSim/Region/ScriptEngine/Shared | |
parent | Fix bug in implementation of "show part pos" that would not filter probably. (diff) | |
download | opensim-SC_OLD-16c9c1dff7bbf299efddd44e4f9aeeb7db38fff6.zip opensim-SC_OLD-16c9c1dff7bbf299efddd44e4f9aeeb7db38fff6.tar.gz opensim-SC_OLD-16c9c1dff7bbf299efddd44e4f9aeeb7db38fff6.tar.bz2 opensim-SC_OLD-16c9c1dff7bbf299efddd44e4f9aeeb7db38fff6.tar.xz |
On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7fa6f05..7620df3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3978,7 +3978,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3978 | World.RegionInfo.RegionName+" "+ | 3978 | World.RegionInfo.RegionName+" "+ |
3979 | m_host.AbsolutePosition.ToString(), | 3979 | m_host.AbsolutePosition.ToString(), |
3980 | agentItem.ID, true, m_host.AbsolutePosition, | 3980 | agentItem.ID, true, m_host.AbsolutePosition, |
3981 | bucket); | 3981 | bucket, true); // TODO: May actually send no timestamp |
3982 | 3982 | ||
3983 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 3983 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
3984 | } | 3984 | } |
@@ -6452,16 +6452,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6452 | if (m_TransferModule != null) | 6452 | if (m_TransferModule != null) |
6453 | { | 6453 | { |
6454 | byte[] bucket = new byte[] { (byte)AssetType.Folder }; | 6454 | byte[] bucket = new byte[] { (byte)AssetType.Folder }; |
6455 | 6455 | ||
6456 | Vector3 pos = m_host.AbsolutePosition; | ||
6457 | |||
6456 | GridInstantMessage msg = new GridInstantMessage(World, | 6458 | GridInstantMessage msg = new GridInstantMessage(World, |
6457 | m_host.UUID, m_host.Name + ", an object owned by " + | 6459 | m_host.OwnerID, m_host.Name, destID, |
6458 | resolveName(m_host.OwnerID) + ",", destID, | ||
6459 | (byte)InstantMessageDialog.TaskInventoryOffered, | 6460 | (byte)InstantMessageDialog.TaskInventoryOffered, |
6460 | false, category + "\n" + m_host.Name + " is located at " + | 6461 | false, string.Format("'{0}'"), |
6461 | World.RegionInfo.RegionName + " " + | 6462 | // We won't go so far as to add a SLURL, but this is the format used by LL as of 2012-10-06 |
6462 | m_host.AbsolutePosition.ToString(), | 6463 | // false, string.Format("'{0}' ( http://slurl.com/secondlife/{1}/{2}/{3}/{4} )", category, World.Name, (int)pos.X, (int)pos.Y, (int)pos.Z), |
6463 | folderID, true, m_host.AbsolutePosition, | 6464 | folderID, false, pos, |
6464 | bucket); | 6465 | bucket, false); |
6465 | 6466 | ||
6466 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 6467 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
6467 | } | 6468 | } |