OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of some LLQuaternion == null checks. Because LLQuaternion is 

a struct and not a class, it can't be null.  So these checks were just
generating compiler warnings on unreachable code.
0.6.0-stable
Sean Dague 2008-07-23 12:39:16 +00:00
parent 9b51bb545e
commit 9e8b456bbc
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -1618,15 +1618,8 @@ namespace OpenSim.Region.Environment.Scenes
if (m_appearance.Texture == null) if (m_appearance.Texture == null)
return; return;
LLQuaternion rot; // Note: because LLQuaternion is a struct, it can't be null
if (m_bodyRot != null) LLQuaternion rot = new LLQuaternion(m_bodyRot.x, m_bodyRot.y, m_bodyRot.z, m_bodyRot.w);
{
rot = new LLQuaternion(m_bodyRot.x, m_bodyRot.y, m_bodyRot.z, m_bodyRot.w);
}
else
{
rot = LLQuaternion.Identity;
}
remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid,
LocalId, m_pos, m_appearance.Texture.ToBytes(), LocalId, m_pos, m_appearance.Texture.ToBytes(),
@ -1682,15 +1675,8 @@ namespace OpenSim.Region.Environment.Scenes
// Needed for standalone // Needed for standalone
m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
LLQuaternion rot; // Note: because LLQuaternion is a struct, it can't be null
if (m_bodyRot != null) LLQuaternion rot = new LLQuaternion(m_bodyRot.x, m_bodyRot.y, m_bodyRot.z, m_bodyRot.w);
{
rot = new LLQuaternion(m_bodyRot.x, m_bodyRot.y, m_bodyRot.z, m_bodyRot.w);
}
else
{
rot = LLQuaternion.Identity;
}
m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId,
m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot); m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot);