diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-01 23:10:06 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 23:10:06 -0800 |
| commit | a41507eef0a79731d1894ccf3179da6165f310ab (patch) | |
| tree | ef018a341a4a7326348ec5bf5907df175a849ed9 /indra/llui/llclipboard.cpp | |
| parent | 44c66e11ccee4f8370dc9cf2a87c44e323c9c68d (diff) | |
EXP-1841 : change mState to mGeneration in LLClipboard.
Diffstat (limited to 'indra/llui/llclipboard.cpp')
| -rw-r--r-- | indra/llui/llclipboard.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp index 037b9cb254..75c197463c 100644 --- a/indra/llui/llclipboard.cpp +++ b/indra/llui/llclipboard.cpp @@ -35,7 +35,7 @@ #include "llwindow.h" LLClipboard::LLClipboard() : - mState(0) + mGeneration(0) { reset(); } @@ -47,8 +47,8 @@ LLClipboard::~LLClipboard() void LLClipboard::reset() { - // Increment the clipboard state - mState++; + // Increment the clipboard count + mGeneration++; // Call the cleanup function (if any) before releasing the object list if (mCutMode && mCleanupCallback) { @@ -84,7 +84,7 @@ bool LLClipboard::addToClipboard(const LLUUID& src, const LLAssetType::EType typ if (res) { mObjects.push_back(src); - mState++; + mGeneration++; } } return res; @@ -138,7 +138,7 @@ bool LLClipboard::addToClipboard(const LLWString &src, S32 pos, S32 len, bool us { mString = mString + sep + src.substr(pos, len); } - mState++; + mGeneration++; return (use_primary ? LLView::getWindow()->copyTextToPrimary(mString) : LLView::getWindow()->copyTextToClipboard(mString)); } |