aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs23
1 files changed, 11 insertions, 12 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c713e19..4b5710a 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1602,8 +1602,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1602 destinationItem.CreationDate = item.CreationDate; 1602 destinationItem.CreationDate = item.CreationDate;
1603 destinationItem.Folder = destinationFolder.ID; 1603 destinationItem.Folder = destinationFolder.ID;
1604 1604
1605 inventoryService.AddItem(destinationItem); 1605 m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(destinationItem);
1606 m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID); 1606 m_log.DebugFormat("[RADMIN]: Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
1607 1607
1608 // Wear item 1608 // Wear item
1609 AvatarWearable newWearable = new AvatarWearable(); 1609 AvatarWearable newWearable = new AvatarWearable();
@@ -1613,7 +1613,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1613 } 1613 }
1614 else 1614 else
1615 { 1615 {
1616 m_log.WarnFormat("[RADMIN] Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID); 1616 m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID);
1617 } 1617 }
1618 } 1618 }
1619 } 1619 }
@@ -1655,16 +1655,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1655 destinationItem.CreationDate = item.CreationDate; 1655 destinationItem.CreationDate = item.CreationDate;
1656 destinationItem.Folder = destinationFolder.ID; 1656 destinationItem.Folder = destinationFolder.ID;
1657 1657
1658 inventoryService.AddItem(destinationItem); 1658 m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(destinationItem);
1659 m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID); 1659 m_log.DebugFormat("[RADMIN]: Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
1660 1660
1661 // Attach item 1661 // Attach item
1662 avatarAppearance.SetAttachment(attachpoint, destinationItem.ID, destinationItem.AssetID); 1662 avatarAppearance.SetAttachment(attachpoint, destinationItem.ID, destinationItem.AssetID);
1663 m_log.DebugFormat("[RADMIN] Attached {0}", destinationItem.ID); 1663 m_log.DebugFormat("[RADMIN]: Attached {0}", destinationItem.ID);
1664 } 1664 }
1665 else 1665 else
1666 { 1666 {
1667 m_log.WarnFormat("[RADMIN] Error transferring {0} to folder {1}", itemID, destinationFolder.ID); 1667 m_log.WarnFormat("[RADMIN]: Error transferring {0} to folder {1}", itemID, destinationFolder.ID);
1668 } 1668 }
1669 } 1669 }
1670 } 1670 }
@@ -1762,16 +1762,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1762 destinationItem.CreationDate = item.CreationDate; 1762 destinationItem.CreationDate = item.CreationDate;
1763 destinationItem.Folder = extraFolder.ID; 1763 destinationItem.Folder = extraFolder.ID;
1764 1764
1765 inventoryService.AddItem(destinationItem); 1765 m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(destinationItem);
1766 inventoryMap.Add(item.ID, destinationItem.ID); 1766 inventoryMap.Add(item.ID, destinationItem.ID);
1767 m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", destinationItem.ID, extraFolder.ID); 1767 m_log.DebugFormat("[RADMIN]: Added item {0} to folder {1}", destinationItem.ID, extraFolder.ID);
1768 1768
1769 // Attach item, if original is attached 1769 // Attach item, if original is attached
1770 int attachpoint = avatarAppearance.GetAttachpoint(item.ID); 1770 int attachpoint = avatarAppearance.GetAttachpoint(item.ID);
1771 if (attachpoint != 0) 1771 if (attachpoint != 0)
1772 { 1772 {
1773 avatarAppearance.SetAttachment(attachpoint, destinationItem.ID, destinationItem.AssetID); 1773 avatarAppearance.SetAttachment(attachpoint, destinationItem.ID, destinationItem.AssetID);
1774 m_log.DebugFormat("[RADMIN] Attached {0}", destinationItem.ID); 1774 m_log.DebugFormat("[RADMIN]: Attached {0}", destinationItem.ID);
1775 } 1775 }
1776 } 1776 }
1777 } 1777 }
@@ -1790,7 +1790,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1790 private bool CreateDefaultAvatars() 1790 private bool CreateDefaultAvatars()
1791 { 1791 {
1792 // Only load once 1792 // Only load once
1793
1794 if (m_defaultAvatarsLoaded) 1793 if (m_defaultAvatarsLoaded)
1795 { 1794 {
1796 return false; 1795 return false;
@@ -2048,7 +2047,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2048 inventoryItem.CreationDate = GetIntegerAttribute(item,"creationdate",Util.UnixTimeSinceEpoch()); 2047 inventoryItem.CreationDate = GetIntegerAttribute(item,"creationdate",Util.UnixTimeSinceEpoch());
2049 inventoryItem.Folder = extraFolder.ID; // Parent folder 2048 inventoryItem.Folder = extraFolder.ID; // Parent folder
2050 2049
2051 inventoryService.AddItem(inventoryItem); 2050 m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(inventoryItem);
2052 m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", inventoryItem.ID, extraFolder.ID); 2051 m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", inventoryItem.ID, extraFolder.ID);
2053 } 2052 }
2054 2053