diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-08-26 17:53:30 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-08-26 17:53:30 -0400 |
| commit | 07c145ad4023593c38ef2d3f07a60a2875f474dd (patch) | |
| tree | e378c35f73ec661f3cfc7f4518beae84824f3da5 /indra/newview/llinventorypanel.cpp | |
| parent | 1bea6e50aa11f691759c6c30850a3415edaa6383 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge. Refresh from viewer-release after SSA.
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rwxr-xr-x | indra/newview/llinventorypanel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index cf1fd4c0d0..e5b9e11d48 100755 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -192,7 +192,7 @@ LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id ) p.show_item_link_overlays = mShowItemLinkOverlays; p.root = NULL; p.options_menu = "menu_inventory.xml"; - + return LLUICtrlFactory::create<LLFolderView>(p); } @@ -396,6 +396,7 @@ LLInventoryFilter::EFolderShow LLInventoryPanel::getShowFolderState() return getFilter().getShowFolderState(); } +// Called when something changed in the global model (new item, item coming through the wire, rename, move, etc...) (CHUI-849) void LLInventoryPanel::modelChanged(U32 mask) { static LLFastTimer::DeclareTimer FTM_REFRESH("Inventory Refresh"); |