aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTom2011-09-07 09:42:18 -0700
committerTom2011-09-07 09:42:18 -0700
commit03f6734f4367b08e2b181ed68bc80b885e76148f (patch)
treefa8550771d3b5eb1a0315f107801b332f78bede5 /OpenSim/Region/ClientStack
parentNow merging the core changes. (diff)
downloadopensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.zip
opensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.tar.gz
opensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.tar.bz2
opensim-SC_OLD-03f6734f4367b08e2b181ed68bc80b885e76148f.tar.xz
First set of merge fixes
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5c94fba..db81fea 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3747,7 +3747,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3747 if (!m_scene.TryGetScenePresence(part.OwnerID, out sp)) 3747 if (!m_scene.TryGetScenePresence(part.OwnerID, out sp))
3748 continue; 3748 continue;
3749 3749
3750 List<SceneObjectGroup> atts = sp.Attachments; 3750 List<SceneObjectGroup> atts = sp.GetAttachments();
3751 bool found = false; 3751 bool found = false;
3752 foreach (SceneObjectGroup att in atts) 3752 foreach (SceneObjectGroup att in atts)
3753 { 3753 {