diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 18:15:07 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 18:15:07 -0400 |
| commit | 0d91c495717ae210aff0248119af6c4ec7ad595d (patch) | |
| tree | 83b6485d150fb6572ad34b7e78ccbcef50ab6dfc /indra/newview/llviewerobject.h | |
| parent | 6732f5fbca2dc83ec1cf6fcb31b5a6657e8d040f (diff) | |
Fix for merge breakages
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 3 |
1 files changed, 0 insertions, 3 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<PotentialReturnableObject>& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion ); void constructAndAddReturnable( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion ); - void buildReturnablesForChildrenVO( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion ); - void constructAndAddReturnable( std::vector<PotentialReturnableObject>& 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 |