d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
79e0e7d298
Merge upstream
2014-06-07 14:14:29 -06:00
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
babd89b770
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2014-05-19 22:19:55 +01:00
e776b600b1
Refactor more script editor properties away from LLTextEditor to LLScriptEditor
2014-05-14 14:08:24 -06:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
1e851a2eb7
correct bad merges from 3.7.7-release
2014-05-07 15:18:44 -04:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
8b86130f25
MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
2014-05-07 18:42:24 +03:00
001621dfc2
MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
2014-05-05 23:24:34 +01:00
dcffb97518
Move some more script editor functions from LLTextEditor to LLScriptEditor
2014-04-18 23:13:57 -06:00
8c39617c9a
Begin moving script editor portions of LLTextEditor to their own derived class.
...
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor
TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-18 12:52:07 -06:00
d6fdc6e68f
merge changes for 3.7.3-release
2014-03-14 16:38:12 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
635a3309f0
MAINT-3610 FIXED SL viewer partly 'eats' chat-messages
2014-03-06 05:51:49 +02:00
00a99d9097
Adding clear methods to remove any highlighting.
2014-02-06 16:47:27 +00:00
52ce788d0c
Pull in viewer-lion to lock down next release
2014-02-18 16:41:21 -08:00
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
74c7460846
MAINT-3618 FIXED Don't copy spaces after cursor to the next line.
2014-01-20 12:48:58 +02:00
7f39d0472e
merge changes for STORM-1831
2013-11-18 13:51:24 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
dc317ed70a
Refactoring load routines to remove uneeded methods
2013-11-10 21:58:17 +00:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
0c1d6d7d9e
Merge v3.6.7 in
2013-10-04 20:47:54 +01:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
82bf4e4db2
merge changes for DRTVWR-285
2013-08-19 15:15:15 -04:00
b7fbcef298
MAINT-3289 (User is not able to open mini inspector by one click on 'i' icon)
2013-10-11 23:06:25 +03:00
3e934d5089
MAINT-3151 (Issue with urls being autoclicked when holding left click into an unfocused textbox then dragging pointer over a url and releasing.)
2013-09-23 09:14:53 +03:00
8fa463113c
MAINT-3119 FIXED Select auto-completed part using cursor position
2013-09-17 12:20:28 +03:00
b0a873570e
MAINT-3289 (User is not able to open mini inspector by one click on 'i' icon)
2013-10-11 22:45:12 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
7d5ed4f747
Moving LSL highlighting colour info into .../skins/default/colors.xml where it makes more sense than its own xml file. Changing other functions to read it.
2013-06-27 21:28:52 +01:00
b615858d6c
Merging last four months of development
2013-06-26 17:39:23 +01:00
90a3285e26
CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0
2013-05-31 20:05:12 +03:00
51fab4d45c
Pull merge from viewer-release
2013-05-22 13:59:53 -07:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
c6d4e449e4
CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0
2013-05-22 16:35:08 +03:00
72e7269da3
merge changes for 3.5.2-release
2013-05-20 09:08:20 -04:00
36a51f4927
CHUI-958 FIXED Log spam: "drawtext: Ran off Segmentation End" and To field in nearby chat blank when selected
2013-05-14 01:30:23 +03:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
0f24668b0a
Merged in Chui beta6+ fixes
2013-03-29 10:37:58 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
e76a4eb7c5
CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem 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-28 17:31:45 -07:00
d7e041d0c7
correct merge error
2013-03-25 16:11:04 -04:00
1057caffaf
merge changes for latest snowstorm project viewer
2013-03-22 18:08:49 -04:00
a625dbe35e
merge changes for 3.5.0-beta3
2013-03-15 15:42:21 -04:00
75722baf29
merge changes for latest viewer-development
2013-03-13 15:15:15 -04:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
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-12 22:34:15 +00:00
cb6574c905
CHUI-845 : Avoid some xml param parsing error that seems to be linked with crashers
2013-03-12 19:38:01 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
7183cecd14
STORM-1831 merging in previous work
2013-02-05 16:37:37 +00:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
163f3de73d
CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater
...
Modified LLAutoReplace to pass back a string for replacement instead of modifying the input string
2013-01-25 19:53:12 +00:00
d67804543d
CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater
...
Fixed autoreplace in LLTextEditor so it updates correctly and works with undo
2013-01-25 01:57:56 +00:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
977d318ac8
CHUI-291 FIX New auto-replace feature does not work with chui text input boxes in conversation floater
...
Moved autoreplace hooks from LLLineEditor to LLTextEditor, and modified LLAutoReplace accordingly
2013-01-23 20:22:28 +00:00
07cc38e9cb
STORM-1855: Improve performance of pasting large blocks of text in the script editor
2012-11-09 15:12:15 -05:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
7632861fc4
STORM-1855: fix performance problem with pasting many lines in script editor
2012-09-18 12:54:32 -04: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
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -07: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
18aabdfd3d
CHUI-127 FIXED (Make chat field auto resizable)
...
- 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-19 09:44:40 +03:00
80b1a2c0a8
STORM-276 Insert braces around if/for/while loops
2012-06-11 13:39:45 +02: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
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
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
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
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
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
551f74125b
Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out the text.
...
Due to some legacy issues, text boxes will not gray out on disable unless they have their text_readonly_color property in xui set to "LabelDisabledColor" (or some other color distinct from their text color).
Reviewed by Richard.
2010-07-15 16:32:50 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
1f79bee86e
EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
...
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit
reviewed by Vir
2010-07-09 14:26:56 -07:00
5c263cdc64
EXT-6333 FIX introduce new segments - LLLineBreakSegment and LLImageSegment
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/241/
--HG--
branch : product-engine
2010-06-03 10:38:03 +03:00
5f49061661
Fixed normal bug EXT-6806 (Context menu conflict: selected text vs group) - prefer text menu if it has selection.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/245/ .
--HG--
branch : product-engine
2010-04-16 13:31:06 +03:00
f252d0d1a0
merge
2010-04-01 15:51:24 -07:00
dcc5e0a4fa
EXT-3531 - Ctrl-p doesn't work reliably on login
...
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01 15:48:56 -07:00
2be2fdca5c
EXT-3606 - Script editor window: next line not indenting if current line wraps
2010-04-01 14:08:49 -07:00
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
69032d8d9d
EXT-5071 - Script Editor slows down FPS when editing scripts with 500+ lines
...
reviewed by Monroe
2010-02-16 19:14:55 -08:00
f8aa91dccb
Fixed function name.
...
--HG--
branch : product-engine
2010-02-10 12:10:43 +02:00
df3da77fa9
merge
2010-02-05 11:34:49 -08:00
ddfc6efbee
EXT-5025 - Tooltips block mouse clicks
...
EXT-4547 [BSI] it is possible to highlight multiple layers of chat
EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider
EXT-3103 Add an option to restrict entering non-ascii symbols in text editor.
reviewed by Leyla
2010-02-05 11:32:33 -08:00
553cf40d13
Updated low bug EXT-4951 - Redundant edit box context menu in list items in Panel Picks/Classifieds.
...
Reverted changeset 8956:930bef051fee.
Added new parameter to control context menu visibility.
--HG--
branch : product-engine
2010-02-05 12:25:18 +02:00
simon