diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 17:53:11 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 17:53:11 -0400 |
| commit | 6732f5fbca2dc83ec1cf6fcb31b5a6657e8d040f (patch) | |
| tree | 48165a2aa3aed2133d1d79742e3d64cce3ca2b01 /indra/newview/llviewerobject.h | |
| parent | 20c3d8485480487d38500c9b18846ca96d1d6f83 (diff) | |
| parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) | |
merge viewer-development to mesh-development
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index cf2975b3b0..f7620707cf 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -44,6 +44,7 @@ #include "v3math.h" #include "llvertexbuffer.h" #include "llbbox.h" +#include "llbbox.h" class LLAgent; // TODO: Get rid of this. class LLAudioSource; @@ -242,6 +243,9 @@ 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 |