aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorSean Dague2008-05-15 15:10:13 +0000
committerSean Dague2008-05-15 15:10:13 +0000
commit0c509ecdde73c7216d717da4fc4d32cb3b9d35c8 (patch)
tree01f6d58284dc69a5111f3651938c5068d71e538e /OpenSim/Region/Environment
parentrefactoring to move AvatarAppearance into Framework and (diff)
downloadopensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.zip
opensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.tar.gz
opensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.tar.bz2
opensim-SC_OLD-0c509ecdde73c7216d717da4fc4d32cb3b9d35c8.tar.xz
minor refactor of some properties for readability
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 6f591e8..3815dfb 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1415,7 +1415,7 @@ namespace OpenSim.Region.Environment.Scenes
1415 public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) 1415 public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)
1416 { 1416 {
1417 remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, 1417 remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,
1418 LocalId, m_pos, m_appearance.TextureEntry.ToBytes(), 1418 LocalId, m_pos, m_appearance.Texture.ToBytes(),
1419 m_parentID); 1419 m_parentID);
1420 m_scene.AddAgentUpdates(1); 1420 m_scene.AddAgentUpdates(1);
1421 } 1421 }
@@ -1451,7 +1451,7 @@ namespace OpenSim.Region.Environment.Scenes
1451 public void SendInitialData() 1451 public void SendInitialData()
1452 { 1452 {
1453 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, 1453 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId,
1454 m_pos, m_appearance.TextureEntry.ToBytes(), m_parentID); 1454 m_pos, m_appearance.Texture.ToBytes(), m_parentID);
1455 if (!m_isChildAgent) 1455 if (!m_isChildAgent)
1456 { 1456 {
1457 m_scene.InformClientOfNeighbours(this); 1457 m_scene.InformClientOfNeighbours(this);
@@ -1465,7 +1465,7 @@ namespace OpenSim.Region.Environment.Scenes
1465 public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable) 1465 public void SetWearable(IClientAPI client, int wearableId, AvatarWearable wearable)
1466 { 1466 {
1467 m_appearance.SetWearable(wearableId, wearable); 1467 m_appearance.SetWearable(wearableId, wearable);
1468 client.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++); 1468 client.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
1469 } 1469 }
1470 1470
1471 /// <summary> 1471 /// <summary>
@@ -1474,7 +1474,7 @@ namespace OpenSim.Region.Environment.Scenes
1474 /// <param name="client"></param> 1474 /// <param name="client"></param>
1475 public void SendOwnAppearance() 1475 public void SendOwnAppearance()
1476 { 1476 {
1477 ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.WearablesSerial++); 1477 ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
1478 } 1478 }
1479 1479
1480 /// <summary> 1480 /// <summary>
@@ -1497,9 +1497,9 @@ namespace OpenSim.Region.Environment.Scenes
1497 public void SendAppearanceToOtherAgent(ScenePresence avatar) 1497 public void SendAppearanceToOtherAgent(ScenePresence avatar)
1498 { 1498 {
1499 avatar.ControllingClient.SendAppearance( 1499 avatar.ControllingClient.SendAppearance(
1500 m_appearance.ScenePresenceID, 1500 m_appearance.Owner,
1501 m_appearance.VisualParams, 1501 m_appearance.VisualParams,
1502 m_appearance.TextureEntry.ToBytes() 1502 m_appearance.Texture.ToBytes()
1503 ); 1503 );
1504 } 1504 }
1505 1505
@@ -1804,7 +1804,7 @@ namespace OpenSim.Region.Environment.Scenes
1804 1804
1805 static ScenePresence() 1805 static ScenePresence()
1806 { 1806 {
1807 LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry(); 1807 LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
1808 DefaultTexture = textu.ToBytes(); 1808 DefaultTexture = textu.ToBytes();
1809 } 1809 }
1810 1810
@@ -1983,7 +1983,7 @@ namespace OpenSim.Region.Environment.Scenes
1983*/ 1983*/
1984 if (DefaultTexture == null) 1984 if (DefaultTexture == null)
1985 { 1985 {
1986 LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry(); 1986 LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
1987 DefaultTexture = textu.ToBytes(); 1987 DefaultTexture = textu.ToBytes();
1988 } 1988 }
1989 } 1989 }
@@ -2064,7 +2064,7 @@ namespace OpenSim.Region.Environment.Scenes
2064*/ 2064*/
2065 if (DefaultTexture == null) 2065 if (DefaultTexture == null)
2066 { 2066 {
2067 LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTextureEntry(); 2067 LLObject.TextureEntry textu = AvatarAppearance.GetDefaultTexture();
2068 DefaultTexture = textu.ToBytes(); 2068 DefaultTexture = textu.ToBytes();
2069 } 2069 }
2070 2070