diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-12 13:01:50 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-12 13:01:50 -0600 |
| commit | 58afe469f9d29aea0d3d974ac112725ddbaa3a19 (patch) | |
| tree | 1b2205662a07c8e555ddecb9f09b2cdc3d74bb4e /indra/llui/llclipboard.cpp | |
| parent | f5c431aa7bce953503b33c957ba024bdd9104e63 (diff) | |
Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)
General gl state cleanup in llui.
Make llrender more gGL.begin/end friendly.
Diffstat (limited to 'indra/llui/llclipboard.cpp')
| -rw-r--r-- | indra/llui/llclipboard.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llclipboard.cpp b/indra/llui/llclipboard.cpp index cbd4cb380f..400b899ef2 100644 --- a/indra/llui/llclipboard.cpp +++ b/indra/llui/llclipboard.cpp @@ -103,9 +103,11 @@ BOOL LLClipboard::canPasteString() const void LLClipboard::copyFromPrimarySubstring(const LLWString &src, S32 pos, S32 len, const LLUUID& source_id ) { +#if !LL_DARWIN mSourceID = source_id; mString = src.substr(pos, len); LLView::getWindow()->copyTextToPrimary( mString ); +#endif } |