livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undid deletions in lllineeditor.cpp and lltexteditor.cpp and commented out according sections

Ansariel 2012-06-07 17:53:52 +02:00
parent 67dcfa4c47
commit fd6a004f36
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/llui/lllineeditor.cpp
View File

@ -589,7 +589,8 @@ void LLLineEditor::selectAll()
setCursor(mSelectionEnd);
//mScrollHPos = 0;
mIsSelecting = TRUE;
// <FS:AW> Linux primary "clipboard" tainted by auto-selection
//updatePrimary();
}
// [SL:KB] - Patch: Misc-Spellcheck | Checked: 2010-12-19 (Catznip-2.7.0a) | Added: Catznip-2.5.0a
@ -750,6 +751,10 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
// delay cursor flashing
mKeystrokeTimer.reset();
// take selection to 'primary' clipboard
// <FS:AW> Linux primary "clipboard" tainted by auto-selection
//updatePrimary();
return TRUE;
}
@ -1175,6 +1180,14 @@ BOOL LLLineEditor::handleSelectionKey(KEY key, MASK mask)
break;
}
}
// <FS:AW> Linux primary "clipboard" tainted by auto-selection
//if(handled)
//{
// // take selection to 'primary' clipboard
// updatePrimary();
//}
// </FS:AW> Linux primary "clipboard" tainted by auto-selection
return handled;
}

20
indra/llui/lltexteditor.cpp
View File

@ -699,6 +699,8 @@ void LLTextEditor::selectAll()
mSelectionStart = getLength();
mSelectionEnd = 0;
setCursorPos(mSelectionEnd);
// <FS:AW> Linux primary "clipboard" tainted by auto-selection
//updatePrimary();
}
// [SL:KB] - Patch: Misc-Spellcheck | Checked: 2011-09-09 (Catznip-2.8.0a) | Added: Catznip-2.8.0a
@ -1025,6 +1027,9 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
// delay cursor flashing
resetCursorBlink();
// take selection to 'primary' clipboard
// <FS:AW> Linux primary "clipboard" tainted by auto-selection
//updatePrimary();
handled = TRUE;
}
@ -1342,6 +1347,14 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
}
}
// <FS:AW> Linux primary "clipboard" tainted by auto-selection
//if( handled )
//{
// // take selection to 'primary' clipboard
// updatePrimary();
//}
// </FS:AW> Linux primary "clipboard" tainted by auto-selection
return handled;
}
@ -1704,6 +1717,13 @@ BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)
}
}
// <FS:AW> Linux primary "clipboard" tainted by auto-selection
//if (handled)
//{
// updatePrimary();
//}
// </FS:AW> Linux primary "clipboard" tainted by auto-selection
return handled;
}