aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs24
1 files changed, 16 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8ac1a77..6f591e8 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1461,16 +1461,20 @@ namespace OpenSim.Region.Environment.Scenes
1461 SendAppearanceToAllOtherAgents(); 1461 SendAppearanceToAllOtherAgents();
1462 } 1462 }
1463 1463
1464
1465 public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable)
1466 {
1467 m_appearance.SetWearable(wearableId, wearable);
1468 client.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++);
1469 }
1470
1464 /// <summary> 1471 /// <summary>
1465 /// 1472 ///
1466 /// </summary> 1473 /// </summary>
1467 /// <param name="client"></param> 1474 /// <param name="client"></param>
1468 public void SendOwnAppearance() 1475 public void SendOwnAppearance()
1469 { 1476 {
1470 m_appearance.SendOwnWearables(ControllingClient); 1477 ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++);
1471
1472 // TODO: remove this once the SunModule is slightly more tested
1473 // m_controllingClient.SendViewerTime(m_scene.TimePhase);
1474 } 1478 }
1475 1479
1476 /// <summary> 1480 /// <summary>
@@ -1484,15 +1488,19 @@ namespace OpenSim.Region.Environment.Scenes
1484 { 1488 {
1485 if (scenePresence.UUID != UUID) 1489 if (scenePresence.UUID != UUID)
1486 { 1490 {
1487 m_appearance.SendAppearanceToOtherAgent(scenePresence); 1491 SendAppearanceToOtherAgent(scenePresence);
1488 } 1492 }
1489 }); 1493 });
1490 m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); 1494 m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS);
1491 } 1495 }
1492 1496
1493 public void SendAppearanceToOtherAgent(ScenePresence avatar) 1497 public void SendAppearanceToOtherAgent(ScenePresence avatar)
1494 { 1498 {
1495 m_appearance.SendAppearanceToOtherAgent(avatar); 1499 avatar.ControllingClient.SendAppearance(
1500 m_appearance.ScenePresenceID,
1501 m_appearance.VisualParams,
1502 m_appearance.TextureEntry.ToBytes()
1503 );
1496 } 1504 }
1497 1505
1498 public void SetAppearance(byte[] texture, List<byte> visualParam) 1506 public void SetAppearance(byte[] texture, List<byte> visualParam)
@@ -1505,7 +1513,7 @@ namespace OpenSim.Region.Environment.Scenes
1505 1513
1506 public void SetWearable(int wearableId, AvatarWearable wearable) 1514 public void SetWearable(int wearableId, AvatarWearable wearable)
1507 { 1515 {
1508 m_appearance.SetWearable(ControllingClient, wearableId, wearable); 1516 m_appearance.SetWearable(wearableId, wearable);
1509 } 1517 }
1510 1518
1511 /// <summary> 1519 /// <summary>