diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 14:19:53 -0700 |
| commit | 68b62747edb7073dd3f4975e2b38388ae80d801c (patch) | |
| tree | 73730fdc31d3d74a2ba69ad156217299115cd810 /indra/llui/llclipboard.cpp | |
| parent | a1afe50feb1c42cc21c7f89b4187a8f7abe0c9fc (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llclipboard.cpp')
| -rwxr-xr-x | indra/llui/llclipboard.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp index 14173fdbb0..1d18cb2bb0 100755 --- a/indra/llui/llclipboard.cpp +++ b/indra/llui/llclipboard.cpp @@ -88,6 +88,7 @@ bool LLClipboard::pasteFromClipboard(std::vector<LLUUID>& inv_objects) const { bool res = false; S32 count = mObjects.size(); + inv_objects.reserve(inv_objects.size() + count); if (count > 0) { res = true; |