diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-20 11:44:26 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-20 11:44:26 -0400 |
| commit | b0c700bfa0b94ca9288470d1bae78ce12369d4f5 (patch) | |
| tree | a9ba02e80bf88d6234f34c35d63b05dc5c27e8e1 /indra/newview/llfolderview.cpp | |
| parent | 06aa2322b2b769fec118ac1f2f0f51c915f5ec23 (diff) | |
| parent | 62040b686568410cdd87d12228b48f0b2ee12f1b (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 87c5a830e9..14d3bda8e9 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1195,7 +1195,7 @@ void LLFolderView::propertiesSelectedItems( void ) void LLFolderView::changeType(LLInventoryModel *model, LLFolderType::EType new_folder_type) { - LLFolderBridge *folder_bridge = LLFolderBridge::sSelf; + LLFolderBridge *folder_bridge = LLFolderBridge::sSelf.get(); if (!folder_bridge) return; LLViewerInventoryCategory *cat = folder_bridge->getCategory(); |