aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-06 02:34:49 +0100
committerJustin Clark-Casey (justincc)2012-10-06 02:34:49 +0100
commit16c9c1dff7bbf299efddd44e4f9aeeb7db38fff6 (patch)
treeaffb51dd09432b08673ec0201f24f87e9f61797e /OpenSim/Region/CoreModules/Framework
parentFix bug in implementation of "show part pos" that would not filter probably. (diff)
downloadopensim-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/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs22
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index b51570f..617a350 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1068,6 +1068,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1068 Scene initiatingScene) 1068 Scene initiatingScene)
1069 { 1069 {
1070 Thread.Sleep(10000); 1070 Thread.Sleep(10000);
1071
1071 IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>(); 1072 IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>();
1072 if (im != null) 1073 if (im != null)
1073 { 1074 {
@@ -1080,11 +1081,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1080 (uint)(int)position.X, 1081 (uint)(int)position.X,
1081 (uint)(int)position.Y, 1082 (uint)(int)position.Y,
1082 (uint)(int)position.Z); 1083 (uint)(int)position.Z);
1083 GridInstantMessage m = new GridInstantMessage(initiatingScene, UUID.Zero, 1084
1084 "Region", agent.UUID, 1085 GridInstantMessage m
1085 (byte)InstantMessageDialog.GodLikeRequestTeleport, false, 1086 = new GridInstantMessage(
1086 "", gotoLocation, false, new Vector3(127, 0, 0), 1087 initiatingScene,
1087 new Byte[0]); 1088 UUID.Zero,
1089 "Region",
1090 agent.UUID,
1091 (byte)InstantMessageDialog.GodLikeRequestTeleport,
1092 false,
1093 "",
1094 gotoLocation,
1095 false,
1096 new Vector3(127, 0, 0),
1097 new Byte[0],
1098 false);
1099
1088 im.SendInstantMessage(m, delegate(bool success) 1100 im.SendInstantMessage(m, delegate(bool success)
1089 { 1101 {
1090 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success); 1102 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success);