diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-07 13:50:30 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-07 13:50:30 -0500 |
| commit | ee159d8e742a7281f304fc45b692c111706d294e (patch) | |
| tree | 362eb9968fa778bfdd4a300b6a0b642818a973be /indra/newview/llfolderview.cpp | |
| parent | 3ddd6ad286c5cf24dbfd6b5e46fcb23f9ac25e19 (diff) | |
| parent | 83fbe4a631ed04d620b0da2fe58b92d74764183f (diff) | |
automated merge viewer2.0->viewer2.0
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 |