diff options
author | Snoopy Pfeffer | 2011-09-25 00:51:43 +0200 |
---|---|---|
committer | Snoopy Pfeffer | 2011-09-25 00:51:43 +0200 |
commit | 2b2580e3a12d5c493f9a77bf9435ca32a0a0355c (patch) | |
tree | 4831c47e9acf20a0be9d40db9bf48e86135c1c8b /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Remove the unimplented "clear assets" command. (diff) | |
download | opensim-SC_OLD-2b2580e3a12d5c493f9a77bf9435ca32a0a0355c.zip opensim-SC_OLD-2b2580e3a12d5c493f9a77bf9435ca32a0a0355c.tar.gz opensim-SC_OLD-2b2580e3a12d5c493f9a77bf9435ca32a0a0355c.tar.bz2 opensim-SC_OLD-2b2580e3a12d5c493f9a77bf9435ca32a0a0355c.tar.xz |
Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates are only sent to affected clients.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 632ac8f..d631c12 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2999,6 +2999,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2999 | if (ParentGroup.IsDeleted) | 2999 | if (ParentGroup.IsDeleted) |
3000 | return; | 3000 | return; |
3001 | 3001 | ||
3002 | if (ParentGroup.IsAttachment && (ParentGroup.AttachedAvatar != remoteClient.AgentId) && | ||
3003 | (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38)) | ||
3004 | return; | ||
3005 | |||
3002 | clientFlags &= ~(uint) PrimFlags.CreateSelected; | 3006 | clientFlags &= ~(uint) PrimFlags.CreateSelected; |
3003 | 3007 | ||
3004 | if (remoteClient.AgentId == _ownerID) | 3008 | if (remoteClient.AgentId == _ownerID) |
@@ -4786,7 +4790,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4786 | if (ParentGroup.IsDeleted) | 4790 | if (ParentGroup.IsDeleted) |
4787 | return; | 4791 | return; |
4788 | 4792 | ||
4789 | if (ParentGroup.IsAttachment && ParentGroup.RootPart != this) | 4793 | if (ParentGroup.IsAttachment && ((ParentGroup.RootPart != this) || |
4794 | ((ParentGroup.AttachedAvatar != remoteClient.AgentId) && (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38)))) | ||
4790 | return; | 4795 | return; |
4791 | 4796 | ||
4792 | // Causes this thread to dig into the Client Thread Data. | 4797 | // Causes this thread to dig into the Client Thread Data. |