aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-01 01:22:28 +0100
committerJustin Clark-Casey (justincc)2011-09-01 01:22:28 +0100
commit095b3e5756bb3160b30c9c5670ba008fa13d2e66 (patch)
tree0052b92cf46d42d714740bb4c7404edbdbaea0de /OpenSim/Region/ClientStack/Linden
parentFix a bug where the non-root parts of rezzed objects that had previously been... (diff)
downloadopensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.zip
opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.gz
opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.bz2
opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.xz
Remove pointless cluttering SOP.ParentGroup != null checks.
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database. At all other times it's not possible for a SOP not to have a SOG parent.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 661e9db..e9ee7be 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -4756,10 +4756,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4756 { 4756 {
4757 SceneObjectPart part = (SceneObjectPart)entity; 4757 SceneObjectPart part = (SceneObjectPart)entity;
4758 4758
4759 if (part.ParentGroup != null) 4759 attachPoint = part.ParentGroup.AttachmentPoint;
4760 attachPoint = part.ParentGroup.AttachmentPoint;
4761 else
4762 attachPoint = 0;
4763 4760
4764// m_log.DebugFormat( 4761// m_log.DebugFormat(
4765// "[LLCLIENTVIEW]: Sending attachPoint {0} for {1} {2} to {3}", 4762// "[LLCLIENTVIEW]: Sending attachPoint {0} for {1} {2} to {3}",
@@ -4921,7 +4918,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4921 //update.JointType = 0; 4918 //update.JointType = 0;
4922 update.Material = data.Material; 4919 update.Material = data.Material;
4923 update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim 4920 update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
4924 if (data.ParentGroup != null && data.ParentGroup.IsAttachment) 4921 if (data.ParentGroup.IsAttachment)
4925 { 4922 {
4926 update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.FromItemID); 4923 update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.FromItemID);
4927 update.State = (byte)((data.ParentGroup.AttachmentPoint % 16) * 16 + (data.ParentGroup.AttachmentPoint / 16)); 4924 update.State = (byte)((data.ParentGroup.AttachmentPoint % 16) * 16 + (data.ParentGroup.AttachmentPoint / 16));