aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs19
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index a82d25a..eda2934 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1430,8 +1430,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1430 private void establishAppearance(UUID dest, UUID srca) 1430 private void establishAppearance(UUID dest, UUID srca)
1431 { 1431 {
1432 m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", dest, srca); 1432 m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", dest, srca);
1433 1433 AvatarAppearance ava = null;
1434 AvatarAppearance ava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(srca); 1434 AvatarData avatar = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(srca);
1435 if (avatar != null)
1436 ava = avatar.ToAvatarAppearance();
1435 1437
1436 // If the model has no associated appearance we're done. 1438 // If the model has no associated appearance we're done.
1437 1439
@@ -1524,7 +1526,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1524 throw new Exception("Unable to load both inventories"); 1526 throw new Exception("Unable to load both inventories");
1525 } 1527 }
1526 1528
1527 m_app.CommunicationsManager.AvatarService.UpdateUserAppearance(dest, ava); 1529 AvatarData adata = new AvatarData(ava);
1530 m_app.SceneManager.CurrentOrFirstScene.AvatarService.SetAvatar(dest, adata);
1528 } 1531 }
1529 catch (Exception e) 1532 catch (Exception e)
1530 { 1533 {
@@ -1671,10 +1674,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1671 iserv.GetUserInventory(ID, uic.callback); 1674 iserv.GetUserInventory(ID, uic.callback);
1672 1675
1673 // While the inventory is being fetched, setup for appearance processing 1676 // While the inventory is being fetched, setup for appearance processing
1674 if ((mava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(ID)) == null) 1677 AvatarData adata = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(ID);
1675 { 1678 if (adata != null)
1679 mava = adata.ToAvatarAppearance();
1680 else
1676 mava = new AvatarAppearance(); 1681 mava = new AvatarAppearance();
1677 }
1678 1682
1679 { 1683 {
1680 AvatarWearable[] wearables = mava.Wearables; 1684 AvatarWearable[] wearables = mava.Wearables;
@@ -1809,7 +1813,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1809 m_log.DebugFormat("[RADMIN] Outfit {0} load completed", oname); 1813 m_log.DebugFormat("[RADMIN] Outfit {0} load completed", oname);
1810 } // foreach outfit 1814 } // foreach outfit
1811 m_log.DebugFormat("[RADMIN] Inventory update complete for {0}", name); 1815 m_log.DebugFormat("[RADMIN] Inventory update complete for {0}", name);
1812 m_app.CommunicationsManager.AvatarService.UpdateUserAppearance(ID, mava); 1816 AvatarData adata2 = new AvatarData(mava);
1817 m_app.SceneManager.CurrentOrFirstScene.AvatarService.SetAvatar(ID, adata2);
1813 } 1818 }
1814 catch (Exception e) 1819 catch (Exception e)
1815 { 1820 {