summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-03-01 23:10:06 -0800
committerMerov Linden <merov@lindenlab.com>2012-03-01 23:10:06 -0800
commita41507eef0a79731d1894ccf3179da6165f310ab (patch)
treeef018a341a4a7326348ec5bf5907df175a849ed9 /indra/newview
parent44c66e11ccee4f8370dc9cf2a87c44e323c9c68d (diff)
EXP-1841 : change mState to mGeneration in LLClipboard.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorypanel.cpp6
1 files changed, 3 insertions, 3 deletions
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);
}