diff options
author | Justin Clarke Casey | 2008-05-16 16:37:31 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-16 16:37:31 +0000 |
commit | 772f88d2e5f4824e06575650736ec11b6ea564d8 (patch) | |
tree | 3799fdede4c353124517e84215e7c981176cca2f /OpenSim/Region/Environment/Scenes | |
parent | add to / from hash mapping for grid serialization (diff) | |
download | opensim-SC-772f88d2e5f4824e06575650736ec11b6ea564d8.zip opensim-SC-772f88d2e5f4824e06575650736ec11b6ea564d8.tar.gz opensim-SC-772f88d2e5f4824e06575650736ec11b6ea564d8.tar.bz2 opensim-SC-772f88d2e5f4824e06575650736ec11b6ea564d8.tar.xz |
* Removing unnecessary LLUUID.Zero check from AssetCache
* This revision also includes a very temporary fix for the fact that NREs are received because of a missing avatar apperance in grid mode
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 44805cc..bdf1bba 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1451,9 +1451,14 @@ 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 | ||
1456 | if (null == m_appearance) | ||
1457 | m_appearance = new AvatarAppearance(); | ||
1458 | |||
1455 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, | 1459 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, |
1456 | m_pos, m_appearance.Texture.ToBytes(), m_parentID); | 1460 | m_pos, m_appearance.Texture.ToBytes(), m_parentID); |
1461 | |||
1457 | if (!m_isChildAgent) | 1462 | if (!m_isChildAgent) |
1458 | { | 1463 | { |
1459 | m_scene.InformClientOfNeighbours(this); | 1464 | m_scene.InformClientOfNeighbours(this); |