diff options
| author | prep <prep@lindenlab.com> | 2011-06-22 15:54:16 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-06-22 15:54:16 -0400 |
| commit | 0961c3baaa6f5be42d4c3996c0563f905a8df053 (patch) | |
| tree | ef375e3587f82514dc80f9033201ec5037c15530 /indra/newview/llviewerobject.h | |
| parent | 4caf151c5ad1e07f819bc8e5ab8eda584f41420b (diff) | |
WIP SH-1791 - constructAndAddReturnable() now accepts target region
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index a7d0933dc3..f75a3d996d 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -240,8 +240,8 @@ public: // anti-encroachment is enabled bool isReturnable(); - void buildReturnablesForChildrenVO( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild ); - void constructAndAddReturnable( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild ); + 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 |