summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.cpp
AgeCommit message (Collapse)Author
2013-10-04Merge v3.6.7 inIma Mechanique
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-06-27Moving LSL highlighting colour info into .../skins/default/colors.xml where ↵Ima Mechanique
it makes more sense than its own xml file. Changing other functions to read it.
2013-06-26Merging last four months of developmentIma Mechanique
2013-05-31CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0maksymsproductengine
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0maksymsproductengine
2013-05-20merge changes for 3.5.2-releaseOz Linden
2013-05-14CHUI-958 FIXED Log spam: "drawtext: Ran off Segmentation End" and To field ↵maksymsproductengine
in nearby chat blank when selected
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Merged in Chui beta6+ fixesprep@lindenlab.com
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem ↵Gilbert Gonzales
was because when insert was used at the end of a string of text, this would attempt to delete something past the bounds of the string...as a side effect the size of the segment was increasing even though the string length never changed. The segment size would be greater than the string size and would eventually cause an invalid read outside the bounds of the string.
2013-03-25correct merge errorOz Linden
2013-03-22merge changes for latest snowstorm project viewerOz Linden
2013-03-15merge changes for 3.5.0-beta3Oz Linden
2013-03-13merge changes for latest viewer-developmentOz Linden
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
re-introduced don's refactor of low-level openGL calls pulling out of llui and putting them into llrender. Took the new code from their updated versions from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12CHUI-845 : Avoid some xml param parsing error that seems to be linked with ↵Merov Linden
crashers
2013-03-11Viewer-chui mergeprep
2013-02-05STORM-1831 merging in previous workIma Mechanique
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-25CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Modified LLAutoReplace to pass back a string for replacement instead of modifying the input string
2013-01-25CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Fixed autoreplace in LLTextEditor so it updates correctly and works with undo
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-23CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Moved autoreplace hooks from LLLineEditor to LLTextEditor, and modified LLAutoReplace accordingly
2012-11-09STORM-1855: Improve performance of pasting large blocks of text in the ↵Oz Linden
script editor
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-09-18STORM-1855: fix performance problem with pasting many lines in script editorOz Linden
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-17MAINT-1276: Add ability to paste LSL tooltips into scripts. Reviewed by Kellysimon@Simon-PC.lindenlab.com
2012-06-19CHUI-127 FIXED (Make chat field auto resizable)Paul ProductEngine
- Replaced LLLineEditor with newly created LLChatEntry - Moved some functionality (such as setting label) to the LLTextBase as it can be useful to the other derived classes
2012-06-11STORM-276 Insert braces around if/for/while loopsKitty Barnett
2012-05-20Merged with viewer-betaKitty Barnett
2012-05-08merge changes for version 3.3.1Oz Linden
2012-03-01EXP-1841 : Use instance instead of getInstance on LLClipboard singleton.Merov Linden
2012-03-01Pull from viewer-experienceMerov Linden
2012-02-06EXP-1841 : Refactoring of LLClipboard, simplify the API and make it behave ↵Merov Linden
like a normal clipboard.
2012-02-03STORM-276 Added spellcheck functionality to the LLTextEditor controlKitty Barnett
2012-02-01EXP-1862 : Make LLClipboard an LLSingleton and clean up the internals (set ↵Merov Linden
up for toolbar and never used)
2012-01-31EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2011-11-23Changes to filter out tabs from file load and to test if loading/saving ↵Ima Mechanique
should be allowed.
2011-04-20STORM-229 ADDITIONAL FIX Disabled updating text segments during indenting ↵Seth ProductEngine
the selected lines with TAB or SHIFT+TAB to prevent the viewer from stalling.
2010-12-13STORM-229 FIXED Fixed long loading times and stalling of Viewer while ↵Andrew Productengine
loading big scripts or pasting a lot of text into script. The bug was fixed by Satomi Ahn. Here is the description of what causes the problem from her comment in ticket: "Disabling the loading of syntax keywords in LLScriptEdCore::postBuild() removes the freeze (and with it: syntax highlighting). So it obviously comes from the parsing of the text. I also noticed something else: by adding a llwarn in LLTextEditor::updateSegments(), I saw that this function was called a lot of times when loading a script, roughly once for each line in the script (naively I would have thought only necessary to update when finished... or to only update the new line). My llwarn was in the "if (mReflowIndex < S32_MAX && mKeywords.isLoaded())", which means that, at each call, the text is actually parsed for all keywords... so the parsing of the script becomes quadratic instead of linear!!!" - To fix this, Satomi added a flag depending on which parsing is disabled when it is not necessary.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:38:46 +0000