diff options
author | Richard Linden <none@none> | 2013-12-09 16:15:13 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-12-09 16:15:13 -0800 |
commit | dd0d7de67d12660b16720c47bdd4b238226d93e5 (patch) | |
tree | bcecede867014c6e054efb0caf3f8dd1c85f9e4b /indra/newview/llinventorypanel.cpp | |
parent | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (diff) | |
parent | 813bc232e7175ba3e20a70f16427d12c7681a996 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
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 e5b9e11d48..d27f7d2527 100755 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -146,7 +146,8 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) : mShowItemLinkOverlays(p.show_item_link_overlays), mShowEmptyMessage(p.show_empty_message), mViewsInitialized(false), - mInvFVBridgeBuilder(NULL) + mInvFVBridgeBuilder(NULL), + mInventoryViewModel(p.name) { mInvFVBridgeBuilder = &INVENTORY_BRIDGE_BUILDER; |