aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-05-24 19:19:44 +0100
committerJustin Clark-Casey (justincc)2010-05-24 19:19:44 +0100
commita6c7995b71ee1886bf94b2c63d0a603525a0667f (patch)
tree23e5e3454bd59aae912e310ccd7754c00f4a97e2 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentbackport some IGroupsModule method doc and an extra exposed method from git m... (diff)
downloadopensim-SC-a6c7995b71ee1886bf94b2c63d0a603525a0667f.zip
opensim-SC-a6c7995b71ee1886bf94b2c63d0a603525a0667f.tar.gz
opensim-SC-a6c7995b71ee1886bf94b2c63d0a603525a0667f.tar.bz2
opensim-SC-a6c7995b71ee1886bf94b2c63d0a603525a0667f.tar.xz
backport from master fix for attachment display
this fix stops two full updates being sent on attachment rather than one. Sending two can stop the client displaying attachments properly
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index af5742c..42a748f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2076,7 +2076,10 @@ namespace OpenSim.Region.Framework.Scenes
2076 group.RootPart.IsAttachment = true; 2076 group.RootPart.IsAttachment = true;
2077 } 2077 }
2078 2078
2079 AddNewSceneObject(group, true); 2079 // If we're rezzing an attachment then don't ask AddNewSceneObject() to update the client since
2080 // we'll be doing that later on. Scheduling more than one full update during the attachment
2081 // process causes some clients to fail to display the attachment properly.
2082 AddNewSceneObject(group, true, !attachment);
2080 2083
2081 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); 2084 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z);
2082 // if attachment we set it's asset id so object updates can reflect that 2085 // if attachment we set it's asset id so object updates can reflect that