diff options
author | Charles Krinke | 2008-05-28 02:00:43 +0000 |
---|---|---|
committer | Charles Krinke | 2008-05-28 02:00:43 +0000 |
commit | 5f2b8fd5e180577880031a334dbe47b4536d804e (patch) | |
tree | 1d1e7ac61d92b3fceff7afd4924f4bbc7a3c551f | |
parent | * Resolves comment removal in string literals in the LSL2CSConverter (diff) | |
download | opensim-SC-5f2b8fd5e180577880031a334dbe47b4536d804e.zip opensim-SC-5f2b8fd5e180577880031a334dbe47b4536d804e.tar.gz opensim-SC-5f2b8fd5e180577880031a334dbe47b4536d804e.tar.bz2 opensim-SC-5f2b8fd5e180577880031a334dbe47b4536d804e.tar.xz |
Thank you kindly, Melanie for a patch that adds a two-stage
check. It seems there may be a race. For me, this patch,
just as it is here, fixes it.
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 19debea..396d752 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1403,7 +1403,13 @@ 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 || remoteAvatar.ControllingClient == null) | 1406 | // 2 stage check is needed. |
1407 | if (remoteAvatar == null) | ||
1408 | return; | ||
1409 | IClientAPI cl=remoteAvatar.ControllingClient; | ||
1410 | if(cl == null) | ||
1411 | return; | ||
1412 | if(m_appearance.Texture == null) | ||
1407 | return; | 1413 | return; |
1408 | 1414 | ||
1409 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, | 1415 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, |