diff options
author | Jeff Ames | 2008-05-17 00:06:35 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-17 00:06:35 +0000 |
commit | a5f08b430d644c7a4274db9fff3db0c63a6a7857 (patch) | |
tree | 4216400d14b587763167839344d61c0a6f6d8c85 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | * Committing patch from mantis 0001297: [PATCH] Fix behavior of child prim in... (diff) | |
download | opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.zip opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.gz opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.bz2 opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 7eaab40..6977083 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1451,15 +1451,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
1451 | /// | 1451 | /// |
1452 | /// </summary> | 1452 | /// </summary> |
1453 | public void SendInitialData() | 1453 | public void SendInitialData() |
1454 | { | 1454 | { |
1455 | // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode | 1455 | // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode |
1456 | LLObject.TextureEntry texture = AvatarAppearance.GetDefaultTexture(); | 1456 | LLObject.TextureEntry texture = AvatarAppearance.GetDefaultTexture(); |
1457 | if (null != m_appearance) | 1457 | if (null != m_appearance) |
1458 | texture = m_appearance.Texture; | 1458 | texture = m_appearance.Texture; |
1459 | 1459 | ||
1460 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, | 1460 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, |
1461 | m_pos, texture.ToBytes(), m_parentID); | 1461 | m_pos, texture.ToBytes(), m_parentID); |
1462 | 1462 | ||
1463 | if (!m_isChildAgent) | 1463 | if (!m_isChildAgent) |
1464 | { | 1464 | { |
1465 | m_scene.InformClientOfNeighbours(this); | 1465 | m_scene.InformClientOfNeighbours(this); |