diff options
author | Sean Dague | 2008-05-19 20:33:54 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-19 20:33:54 +0000 |
commit | 7a52b35c574da5180131e1b5df613c4df09a5065 (patch) | |
tree | 0c2b3c01b419bba56d652176d82ec8faf6c73f6c /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | Thank you kindly, Melanie for a patch that avoids a null (diff) | |
download | opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.zip opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.tar.gz opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.tar.bz2 opensim-SC-7a52b35c574da5180131e1b5df613c4df09a5065.tar.xz |
fix crash in standalone mode for initial appearance setup
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 f7c9b8d..a913a98 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -405,8 +405,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
405 | RegisterToEvents(); | 405 | RegisterToEvents(); |
406 | SetDirectionVectors(); | 406 | SetDirectionVectors(); |
407 | 407 | ||
408 | m_appearance = m_scene.CommsManager.UserService.GetUserAppearance(client.AgentId); | ||
409 | |||
410 | try | 408 | try |
411 | { | 409 | { |
412 | m_scene.LandChannel.SendLandUpdate(this, true); | 410 | m_scene.LandChannel.SendLandUpdate(this, true); |
@@ -1445,6 +1443,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1445 | /// </summary> | 1443 | /// </summary> |
1446 | public void SendInitialData() | 1444 | public void SendInitialData() |
1447 | { | 1445 | { |
1446 | // Needed for standalone | ||
1447 | m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); | ||
1448 | |||
1448 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, | 1449 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, |
1449 | m_pos, m_appearance.Texture.ToBytes(), m_parentID); | 1450 | m_pos, m_appearance.Texture.ToBytes(), m_parentID); |
1450 | 1451 | ||
@@ -2049,7 +2050,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2049 | m_controllingClient = client; | 2050 | m_controllingClient = client; |
2050 | m_regionInfo = region; | 2051 | m_regionInfo = region; |
2051 | m_scene = scene; | 2052 | m_scene = scene; |
2052 | m_appearance = m_scene.CommsManager.UserService.GetUserAppearance(client.AgentId); | ||
2053 | 2053 | ||
2054 | RegisterToEvents(); | 2054 | RegisterToEvents(); |
2055 | 2055 | ||