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/llpanelobjectinventory.cpp | |
| parent | 50cba7940fbea7602f6b55df85fb9a2d2b47279b (diff) | |
| parent | 813bc232e7175ba3e20a70f16427d12c7681a996 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rwxr-xr-x | indra/newview/llpanelobjectinventory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index d7130820ab..bb063f48a5 100755 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1491,7 +1491,8 @@ LLPanelObjectInventory::LLPanelObjectInventory(const LLPanelObjectInventory::Par mFolders(NULL), mHaveInventory(FALSE), mIsInventoryEmpty(TRUE), - mInventoryNeedsUpdate(FALSE) + mInventoryNeedsUpdate(FALSE), + mInventoryViewModel(p.name) { // Setup context menu callbacks mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelObjectInventory::doToSelected, this, _2)); |