diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2013-12-13 00:06:04 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2013-12-13 00:06:04 +0200 |
| commit | ea940a21135c0c8e1b0ab12c2537cb5d3999484b (patch) | |
| tree | 6b6809e299ac72fd05b45b6f55385d8e11b0ba56 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 72d2d1a975bb971fcb9c65b8e12d6f55b6c0c17d (diff) | |
| parent | dd0d7de67d12660b16720c47bdd4b238226d93e5 (diff) | |
merge
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)); |
