6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
cf7eb79fa7
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-08 04:39:11 +00:00
3ed4e54afb
FIRE-3278; Fix crash in LLTextEditor::getSegmentsInRange when iterator first_it points after end_it.
2012-10-15 14:05:51 +02:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
891af8055a
MAINT-1276: Add ability to paste LSL tooltips into scripts. Reviewed by Kelly
2012-07-17 13:52:08 -07:00
80b1a2c0a8
STORM-276 Insert braces around if/for/while loops
2012-06-11 13:39:45 +02:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
0d4ca6478f
removed spellcheck, to be replaced by LL's version
2012-07-10 23:57:05 -07:00
1300f77fdd
Merged with viewer-beta
2012-05-20 17:41:00 +02:00
95090c5d1e
merge changes for version 3.3.1
2012-05-08 15:51:56 -04:00
c5894c2781
Merge with Firestorm LGPL
2012-06-08 22:43:34 +02:00
fd6a004f36
Undid deletions in lllineeditor.cpp and lltexteditor.cpp and commented out according sections
2012-06-07 17:53:52 +02:00
5c66d2e669
fix: Linux primary "clipboard" tainted by auto-selection
...
This reverts to QT/Emacs style primary: only user selections go to the primary.
The Mozilla style LL decided for also takes auto-selected text to the primary,
which makes it pretty useless.
2012-06-06 17:30:07 +02:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
716a64f615
EOL changes, no code changes.
2012-05-19 08:37:10 -07:00
f0a1b43f22
EXP-1841 : Use instance instead of getInstance on LLClipboard singleton.
2012-03-01 21:35:05 -08:00
24789f11cc
Pull from viewer-experience
2012-03-01 13:31:17 -08:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
9761375ac2
EXP-1841 : Refactoring of LLClipboard, simplify the API and make it behave like a normal clipboard.
2012-02-06 15:43:53 -08:00
a9d1121977
STORM-276 Added spellcheck functionality to the LLTextEditor control
2012-02-03 15:20:34 +01:00
c1636911c8
EXP-1862 : Make LLClipboard an LLSingleton and clean up the internals (set up for toolbar and never used)
2012-02-01 19:09:29 -08:00
c47c31fdbf
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-31 17:51:43 -08:00
eeefec394c
Changes to filter out tabs from file load and to test if loading/saving should be allowed.
2011-11-23 01:30:15 +00:00
5ce4e57a29
LSL preproc from NaCL viewer
2012-03-03 20:42:59 -08:00
e60ca836b6
Fixed wrong indentation in LSL script editor if previous lines were wrapped.
2012-03-26 13:37:33 +02:00
ba83861327
Merge with 26411 / 7a29beb4dd99 (FS tip).
2012-02-04 23:18:19 +01:00
9458470c79
FIRE-4885; when pasting large amounts of text truncate the buffer first instead of doing it over and over in LLTextbase::insert*.
2012-02-04 03:34:31 +01:00
6958381112
Merge up to 26092/6ceebf5ce17b; Branch Chat-NearbyChat from catznip-3.2.0 ( http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0 ).
...
This will enable chat docking/undocking from contacts floater again.
2012-01-23 14:56:47 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
480808d5f3
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : Chat-NearbyChat
2011-10-27 16:49:31 +02:00
a200a71ea8
- internal : reviewed for SL-3.0
...
--HG--
branch : Chat-NearbyChat
2011-09-19 23:53:06 +02:00
e6b55bafb0
- added : multi-line chat bar to the nearby chat history floater
...
--HG--
branch : Chat-NearbyChat
2011-08-20 12:39:37 +02:00
f00eb3e161
STORM-229 ADDITIONAL FIX Disabled updating text segments during indenting the selected lines with TAB or SHIFT+TAB to prevent the viewer from stalling.
2011-04-20 17:31:57 +03:00
d3eccbcd8b
STORM-229 FIXED Fixed long loading times and stalling of Viewer while 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-12-13 13:17:48 +02:00
f678ff9919
Merged in spell checker branch
2011-09-18 19:37:29 +02:00
095c0b6a8a
- fixed : right-clicking on a right-to-left selection deselects the current selection
...
-> in a right-to-left selection mSelectionEnd < mSelectionStart so the user was always seen as clicking "outside" the selection
--HG--
branch : Misc-Spellcheck
2011-09-16 02:02:13 +02:00
57090ae504
FIRE-1599 Add textsearch to Notecards, patch submitted by Satomi Ahn and Kitty Barnett
2011-09-15 21:08:45 +02:00
0c5f9ed681
- added : right-click misspelling suggestion menu for text editor
...
--HG--
branch : Misc-Spellcheck
2011-09-09 16:33:12 +02:00
8edfff7669
- changed : don't provide feedback on the current word while it's still being typed/edited (for text editors)
...
--HG--
branch : Misc-Spellcheck
2011-09-08 21:15:19 +02:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
7056d9eada
FIRE-119 STORM-229 Satomi Ahn - Speed up script loading by delaying syntax parsing until script is fully available
2010-12-11 19:46:47 -05:00
e43b3f590c
FIRE-119 VWR-20553 Satomi Ahn script editor pastes blocks using line by line
2010-12-11 19:33:45 -05:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
d72a21aca1
further UI rendering performance improvements
2010-07-30 15:17:32 -07:00
Tank_Master