From 0d91c495717ae210aff0248119af6c4ec7ad595d Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 10 Aug 2011 18:15:07 -0400 Subject: Fix for merge breakages --- indra/newview/llviewerobject.h | 3 --- indra/newview/llviewerregion.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index f7620707cf..af96bd8fde 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -243,9 +243,6 @@ public: void buildReturnablesForChildrenVO( std::vector& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion ); void constructAndAddReturnable( std::vector& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion ); - void buildReturnablesForChildrenVO( std::vector& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion ); - void constructAndAddReturnable( std::vector& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion ); - /* // This method will scan through this object, and then query the // selection manager to see if the local agent probably has the diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 415963ff53..a7fac0e29d 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1486,8 +1486,6 @@ void LLViewerRegion::unpackRegionHandshake() msg->sendReliable(host); } -void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) -{ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { capabilityNames.append("AttachmentResources"); -- cgit v1.2.3