diff options
| author | richard <none@none> | 2009-12-07 13:46:30 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-07 13:46:30 -0800 |
| commit | a162a8de977de373b451b93b0ce3617cdbe59a39 (patch) | |
| tree | 3ca00252d0a9518b2e655399f91765065e933261 /indra/newview/llfolderview.cpp | |
| parent | 1d2a8e0f83ab85d0a907b66b55af12ea41891f65 (diff) | |
| parent | 13c998c34ac2c1f134b4c6998413753f94e1a002 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 6a3462f201..4e77b42187 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2208,9 +2208,9 @@ void LLFolderView::setFilterPermMask( PermissionMask filter_perm_mask ) mFilter->setFilterPermissions(filter_perm_mask); } -U32 LLFolderView::getFilterTypes() const +U32 LLFolderView::getFilterObjectTypes() const { - return mFilter->getFilterTypes(); + return mFilter->getFilterObjectTypes(); } PermissionMask LLFolderView::getFilterPermissions() const |