diff options
| author | simon <none@none> | 2014-02-18 16:41:21 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-18 16:41:21 -0800 |
| commit | 52ce788d0cf77361dc337edaf136f401acd0d4a9 (patch) | |
| tree | 10b483a50bb1f3d897ece66d118036201bd74af7 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 54ab932884c386950f4f31b9ee63446053c03d59 (diff) | |
| parent | a347267cf1c55a3bd57d30117b8aa834623e1d61 (diff) | |
Pull in viewer-lion to lock down next release
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)); |