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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

integration
Diva Canto 2012-11-12 21:15:35 -08:00
parent 31177d9259 2fd36653b9
commit 99ccd4ea44
2 changed files with 74 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@ -298,73 +298,76 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
} }
} }
// XXX: This code was placed here to try and accomdate RLV which moves given folders named #RLV/~<name> // Disabled for now as it looks like http://opensimulator.org/mantis/view.php?id=6311 was fixed by fixes
// to a folder called name in #RLV. However, this approach may not be ultimately correct - from analysis // to inventory folder versioning allowing the viewer to move the received folder itself as happens on the
// of Firestorm 4.2.2 on sending an InventoryOffered instead of TaskInventoryOffered (as was previously // LL grid. Doing it again server-side then wrongly does a second create and move
// done), the viewer itself would appear to move and rename the folder, rather than the simulator doing it here. // // XXX: This code was placed here to try and accomdate RLV which moves given folders named #RLV/~<name>
else if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted) // // to a folder called name in #RLV. However, this approach may not be ultimately correct - from analysis
{ // // of Firestorm 4.2.2 on sending an InventoryOffered instead of TaskInventoryOffered (as was previously
UUID destinationFolderID = UUID.Zero; // // done), the viewer itself would appear to move and rename the folder, rather than the simulator doing it here.
// else if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
if (im.binaryBucket != null && im.binaryBucket.Length >= 16) // {
{ // UUID destinationFolderID = UUID.Zero;
destinationFolderID = new UUID(im.binaryBucket, 0); //
} // if (im.binaryBucket != null && im.binaryBucket.Length >= 16)
// {
if (destinationFolderID != UUID.Zero) // destinationFolderID = new UUID(im.binaryBucket, 0);
{ // }
InventoryFolderBase destinationFolder = new InventoryFolderBase(destinationFolderID, client.AgentId); //
if (destinationFolder == null) // if (destinationFolderID != UUID.Zero)
{ // {
m_log.WarnFormat( // InventoryFolderBase destinationFolder = new InventoryFolderBase(destinationFolderID, client.AgentId);
"[INVENTORY TRANSFER]: TaskInventoryAccepted message from {0} in {1} specified folder {2} which does not exist", // if (destinationFolder == null)
client.Name, scene.Name, destinationFolderID); // {
// m_log.WarnFormat(
return; // "[INVENTORY TRANSFER]: TaskInventoryAccepted message from {0} in {1} specified folder {2} which does not exist",
} // client.Name, scene.Name, destinationFolderID);
//
IInventoryService invService = scene.InventoryService; // return;
// }
UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip //
// IInventoryService invService = scene.InventoryService;
InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId); //
item = invService.GetItem(item); // UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
InventoryFolderBase folder = null; //
UUID? previousParentFolderID = null; // InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
// item = invService.GetItem(item);
if (item != null) // It's an item // InventoryFolderBase folder = null;
{ // UUID? previousParentFolderID = null;
previousParentFolderID = item.Folder; //
item.Folder = destinationFolderID; // if (item != null) // It's an item
// {
invService.DeleteItems(item.Owner, new List<UUID>() { item.ID }); // previousParentFolderID = item.Folder;
scene.AddInventoryItem(client, item); // item.Folder = destinationFolderID;
} //
else // invService.DeleteItems(item.Owner, new List<UUID>() { item.ID });
{ // scene.AddInventoryItem(client, item);
folder = new InventoryFolderBase(inventoryID, client.AgentId); // }
folder = invService.GetFolder(folder); // else
// {
if (folder != null) // It's a folder // folder = new InventoryFolderBase(inventoryID, client.AgentId);
{ // folder = invService.GetFolder(folder);
previousParentFolderID = folder.ParentID; //
folder.ParentID = destinationFolderID; // if (folder != null) // It's a folder
invService.MoveFolder(folder); // {
} // previousParentFolderID = folder.ParentID;
} // folder.ParentID = destinationFolderID;
// invService.MoveFolder(folder);
// Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code). // }
if (previousParentFolderID != null) // }
{ //
InventoryFolderBase previousParentFolder // // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code).
= new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId); // if (previousParentFolderID != null)
previousParentFolder = invService.GetFolder(previousParentFolder); // {
scene.SendInventoryUpdate(client, previousParentFolder, true, true); // InventoryFolderBase previousParentFolder
// = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
scene.SendInventoryUpdate(client, destinationFolder, true, true); // previousParentFolder = invService.GetFolder(previousParentFolder);
} // scene.SendInventoryUpdate(client, previousParentFolder, true, true);
} //
} // scene.SendInventoryUpdate(client, destinationFolder, true, true);
// }
// }
// }
else if ( else if (
im.dialog == (byte)InstantMessageDialog.InventoryDeclined im.dialog == (byte)InstantMessageDialog.InventoryDeclined
|| im.dialog == (byte)InstantMessageDialog.TaskInventoryDeclined) || im.dialog == (byte)InstantMessageDialog.TaskInventoryDeclined)

4
OpenSim/Tests/Common/Helpers/SceneHelpers.cs
View File

@ -350,6 +350,10 @@ namespace OpenSim.Tests.Common
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// If called directly, then all the modules must be shared modules. /// If called directly, then all the modules must be shared modules.
///
/// We are emulating here the normal calls made to setup region modules
/// (Initialise(), PostInitialise(), AddRegion, RegionLoaded()).
/// TODO: Need to reuse normal runtime module code.
/// </remarks> /// </remarks>
/// <param name="scenes"></param> /// <param name="scenes"></param>
/// <param name="config"></param> /// <param name="config"></param>