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 0a7b990..85a3044 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1394,8 +1394,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1394 private void establishAppearance(UUID dest, UUID srca) 1394 private void establishAppearance(UUID dest, UUID srca)
1395 { 1395 {
1396 m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", dest, srca); 1396 m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", dest, srca);
1397 1397 AvatarAppearance ava = null;
1398 AvatarAppearance ava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(srca); 1398 AvatarData avatar = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(srca);
1399 if (avatar != null)
1400 ava = avatar.ToAvatarAppearance();
1399 1401
1400 // If the model has no associated appearance we're done. 1402 // If the model has no associated appearance we're done.
1401 1403
@@ -1488,7 +1490,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1488 throw new Exception("Unable to load both inventories"); 1490 throw new Exception("Unable to load both inventories");
1489 } 1491 }
1490 1492
1491 m_app.CommunicationsManager.AvatarService.UpdateUserAppearance(dest, ava); 1493 AvatarData adata = new AvatarData(ava);
1494 m_app.SceneManager.CurrentOrFirstScene.AvatarService.SetAvatar(dest, adata);
1492 } 1495 }
1493 catch (Exception e) 1496 catch (Exception e)
1494 { 1497 {
@@ -1635,10 +1638,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1635 iserv.GetUserInventory(ID, uic.callback); 1638 iserv.GetUserInventory(ID, uic.callback);
1636 1639
1637 // While the inventory is being fetched, setup for appearance processing 1640 // While the inventory is being fetched, setup for appearance processing
1638 if ((mava = m_app.CommunicationsManager.AvatarService.GetUserAppearance(ID)) == null) 1641 AvatarData adata = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(ID);
1639 { 1642 if (adata != null)
1643 mava = adata.ToAvatarAppearance();
1644 else
1640 mava = new AvatarAppearance(); 1645 mava = new AvatarAppearance();
1641 }
1642 1646
1643 { 1647 {
1644 AvatarWearable[] wearables = mava.Wearables; 1648 AvatarWearable[] wearables = mava.Wearables;
@@ -1773,7 +1777,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1773 m_log.DebugFormat("[RADMIN] Outfit {0} load completed", oname); 1777 m_log.DebugFormat("[RADMIN] Outfit {0} load completed", oname);
1774 } // foreach outfit 1778 } // foreach outfit
1775 m_log.DebugFormat("[RADMIN] Inventory update complete for {0}", name); 1779 m_log.DebugFormat("[RADMIN] Inventory update complete for {0}", name);
1776 m_app.CommunicationsManager.AvatarService.UpdateUserAppearance(ID, mava); 1780 AvatarData adata2 = new AvatarData(mava);
1781 m_app.SceneManager.CurrentOrFirstScene.AvatarService.SetAvatar(ID, adata2);
1777 } 1782 }
1778 catch (Exception e) 1783 catch (Exception e)
1779 { 1784 {