From a41507eef0a79731d1894ccf3179da6165f310ab Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 1 Mar 2012 23:10:06 -0800 Subject: EXP-1841 : change mState to mGeneration in LLClipboard. --- indra/newview/llinventorypanel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index b7e2e8c67c..b417689858 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -249,7 +249,7 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params) } // keep track of the clipboard state so that we avoid filtering too much - mClipboardState = LLClipboard::instance().getState(); + mClipboardState = LLClipboard::instance().getGeneration(); // Initialize base class params. LLPanel::initFromParams(params); @@ -283,9 +283,9 @@ void LLInventoryPanel::draw() mFolderRoot->updateSelection(); // Nudge the filter if the clipboard state changed - if (mClipboardState != LLClipboard::instance().getState()) + if (mClipboardState != LLClipboard::instance().getGeneration()) { - mClipboardState = LLClipboard::instance().getState(); + mClipboardState = LLClipboard::instance().getGeneration(); getFilter()->setModified(LLClipboard::instance().isCutMode() ? LLInventoryFilter::FILTER_MORE_RESTRICTIVE : LLInventoryFilter::FILTER_LESS_RESTRICTIVE); } -- cgit v1.2.3