diff options
author | Charles Krinke | 2008-05-25 19:29:25 +0000 |
---|---|---|
committer | Charles Krinke | 2008-05-25 19:29:25 +0000 |
commit | 76a3bde76ef8d65a46969703ed6a88b17baeda4c (patch) | |
tree | c1e63dc892ecedd1adc21eb27c14eaae3b1ae564 | |
parent | Thank you very much, Xantor for a patch that: (diff) | |
download | opensim-SC-76a3bde76ef8d65a46969703ed6a88b17baeda4c.zip opensim-SC-76a3bde76ef8d65a46969703ed6a88b17baeda4c.tar.gz opensim-SC-76a3bde76ef8d65a46969703ed6a88b17baeda4c.tar.bz2 opensim-SC-76a3bde76ef8d65a46969703ed6a88b17baeda4c.tar.xz |
Thank you very much, Melanie for a patch that:
If the m_controllingClient member if a ScenePresence is
null, that would cause a CTB. This patch fixes it.
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index b367ce4..21e650f 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1403,6 +1403,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1403 | /// <param name="remoteAvatar"></param> | 1403 | /// <param name="remoteAvatar"></param> |
1404 | public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) | 1404 | public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) |
1405 | { | 1405 | { |
1406 | if(remoteAvatar == null) | ||
1407 | return; | ||
1408 | IClientAPI rc=remoteAvatar.ControllingClient; | ||
1409 | if(rc == null) | ||
1410 | return; | ||
1411 | |||
1406 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, | 1412 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, |
1407 | LocalId, m_pos, m_appearance.Texture.ToBytes(), | 1413 | LocalId, m_pos, m_appearance.Texture.ToBytes(), |
1408 | m_parentID); | 1414 | m_parentID); |