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
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
7631668abd
Some overall fixing of LLUI, re-adding missing stuff and comments
2013-07-01 00:48:14 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
0754d13748
Remove it from here too.
2013-05-18 08:02:27 -06:00
f22fbaf22c
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
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
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
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
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
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
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
79bcb8dc72
Fixed low bug EXT-4951 - Redundant edit box context menu in list items in Panel Picks/Classifieds
...
--HG--
branch : product-engine
2010-02-04 15:44:45 +02:00
75aec28534
merge.
...
--HG--
branch : product-engine
2010-02-03 18:27:38 +00:00
011673de5a
CID-419
...
Checker: RESOURCE_LEAK
File: /indra/llui/llstyle.h
--HG--
branch : product-engine
2010-02-03 18:22:25 +00:00
5491dd6e98
Further fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client).
...
This should fix the inefficiencies in the append path that made viewer FPS drop severely when addinglarge amounts of text to the nearby chat floater.
Resizing the floater with a huge amount of text in it is still pretty bad, but fixing that will require some bigger architectural changes.
Changed LLTextBase::needsReflow() to take an offset at which to start reflow processing.
Changed most needsReflow() calls in LLTextBase to supply a proper index.
Changed LLTextBase::reflow() to use the reflow index maintained by needsReflow().
Removed all needsReflow() calls from LLTextEditor (the only way for it to manipulate the text is through functions in LLTextBase that already manage reflowing internally).
Removed LLTextEditor::replaceUrlLabel(), since it was identical to the inherited version LLTextBase::replaceUrlLabel().
Reviewed by Richard.
2010-02-02 18:24:11 -08:00
45e700cb3e
merge
2010-02-01 12:39:59 -08:00
9f44c4df79
Fix some Linux build breakage - can't treat the return of a constructor call as a ref with gcc, have to use intermediate variable.
2010-01-25 10:30:57 -08:00
fd33910c39
add comment for EXT-4443 about EXT-4443...
...
--HG--
branch : product-engine
2010-01-26 14:34:02 +02:00
12961b5701
fix for normal EXT-4443 Copying text from notifications fails
...
--HG--
branch : product-engine
2010-01-26 09:12:34 +02:00
337716d946
LLPointer cleanup and fix for EXT-4413
...
reviewed by Rick
2010-01-22 16:51:13 -08:00
0f11042d25
EXT-4095 - [crashhunters] Crash on shutdown in LLTextBase destructor
...
reviewed by James
2010-01-11 17:35:17 -08:00
c6234f352a
variable renames in LLTextBase
2009-12-11 14:34:30 -08:00
25b8258d81
Fixed low bug EXT-3058 ('Save Pick' Button Inoperable When Edit Only Involves Deleting Text from the Description)
...
--HG--
branch : product-engine
2009-12-08 22:27:33 +02:00
7d3b3cc474
Linker optimization - use "extern template" for commonly regenerated templates
...
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
b50ba67bd8
Revert extern template link optimization until I can build/test on PC
2009-11-29 10:19:17 -08:00
5531149ad1
Fix merge error
2009-11-28 21:25:53 -08:00
928b7cba3e
Linker optimization, use extern template for LLView::getChild<>
2009-11-25 22:00:15 -08:00
cfccf4d514
EXT-2780 allow_scroll = false in LLTextEditor will crash the viewer
2009-11-24 11:54:33 +08:00
b1a81afef6
add optional style params in setText function
2009-11-12 21:17:31 +08:00
d181b84dfd
EXT-1478 Tool-tip background and border colors are being ignored
...
EXT-2082 Multifloater preview tab container extends outside window border
EXT-773 odd notecard behaviour on closing an unsaved notcard
reviewed by Richard
2009-11-10 17:10:47 -08:00
0d9682113d
EXT-1980 - Bottom bar buttons retain highlight
...
EXT-1936 - [BSI] Reversion - clicking on avatar name in group chat should bring up profile
also fixed buttons not working on avatar list in IM window
reviewed by Leyla
2009-10-30 11:43:45 -07:00
bb9fe04b5f
EXT-1949 - Viewer freezes on resizing IM window
...
cleaned up some rectangle tracking logic and introduced LLInlineViewSegment param block
reviewed by Leyla
2009-10-28 11:48:10 -07:00
b4dd4a4d77
removed typo
2009-10-27 10:53:08 -07:00
9589ee3f70
EXT-1727 Chat history widget has no context menu for copy/paste operations
...
added ignore for dbghelp.dll
reviewed by James
2009-10-27 10:51:34 -07:00
977dd84534
tweaked clipping rect for scroll containers to not overlap vertical scrollbar
...
fixed reflow logic when resizing text editors that contain widgets (would make text appear and disappear)
reviewed by James
2009-10-26 14:25:45 -07:00
b3d1eb82fa
fix for chat history layout bugs
...
EXT-1728 - there is no new line in the text copied on junction of 2 panels
EXT-1670 - fix chat history use of widgets
reviewed by James
2009-10-21 21:30:40 +00:00
ce5a5f84d5
ext-1670 - fix the chat history use of widgets
...
reviewed by leyla
2009-10-20 00:41:41 +00:00
7aa859b7f4
EXT-1566: Fixed another case of UTF-8 vs UTF-32 coding error for SLURL
...
parsing in text editors. Any time we are looking up segment start/end
ranges we should do this on a wide string.
Also added a convenience LLUrlRegistry::hasUrl() method to easily
determine if a string contains a valid SLURL.
2009-10-16 14:04:23 +00:00
5edb4f2171
removed requirement for specializing ParamCompare on boost::function types
...
eliminated usage of iterator_range from LLInitParam
made LLTextEditor::addChar consistent with truncate in counting text bytes (not including null terminator)
EXT-1494 - Avatar profile description text truncated to 255 characters
reviewed by Leyla
2009-10-15 19:56:45 +00:00
fd846da06c
only add LLScrollContainers to text widgets when requested, saving on LLTextBox construction time
...
combined clip and scroll attributes of text editors and text boxes...if you want to clip text, you need to introduce a scrollbar
moved clear to LLTextEditor so that text boxes won't empty out when calling LLPanel::clearCtrls()
EXT-1354 - added optional wrapping to LLTooltips...inspector tooltips don't wrap, everything else does
added LLFastTimer::reset call on application init to prime timers for pre-login timing
fixed tooltips positioning incorrectly due to mis-sized tooltipview
eliminated hide_scrollbar param for text editors
reviewed by Leyla
2009-10-08 01:48:50 +00:00
ada0f4fa22
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
...
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
f05df68656
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3
...
* Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816
* Major Bugs: EXT-1142 (timeout during login due to processing group IMs)
* Changes: EXT-1216 (minimize message well)
2009-10-01 17:44:44 +00:00
afcdda2e36
EXT-904 Build tools does not show tooltips on any checkbox
...
EXT-877 There is no tooltip with a date for Time indicator in Nav bar
EXT-860 Crosshairs and "Press ESC to..." warning are dislocated in mouselook mode when UI Size is not exactly set to 1.00 (Menu Me -> Preferences-> Graphics)
EXT-783 Script editor inserts text twice when using the editors paste, or choosing LSL elements from the pull-down list.
EXT-764 mis-location of cursor in edit script panel (fixed cursor width)
EXT-658 Inventory window's "Fetched Items" needs spacing
reviewed by James
2009-09-23 22:25:18 +00:00
47abd55908
EXT-944 EXT-1026: reverting my previous fix for these crashes.
...
This didn't work on Windows because wchar_t is 2 bytes on that
platform, not 4 bytes (whereas llwchar is 4 bytes everywhere).
Boost's regex methods need to work on wchar_t, but I believe
that using a UTF-16 string would still be prone to crashing on
Windows as UTF-16 is still a variable-length encoding. Besides,
trying to compile a UTF-16 solution generates weird link errors.
Instead, I'm going to fix this problem a different way. And
I'm starting by reverting the previous attempt. Thanks Win32.
2009-09-23 13:57:06 +00:00
12762053e5
EXT-944 EXT-1026: converted the LLUrlRegistry::findUrl() method to
...
work on an LLWString instead of a std::string, so that we don't have
to worry about character offsets for variable-length-encoded UTF-8
strings.
This was causing crashes whenever we would try to show a textbox with
a URL and foreign characters (> 1 byte chars). Damn, I suck!
2009-09-22 18:00:16 +00:00
58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00:00
79653dfed4
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
...
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
2009-09-07 22:55:07 +00:00
330840af7c
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
...
Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls
in text editors and textboxes, with right-click context menus,
tooltips, and alternate link labels. This includes alert boxes, the
login progress window, local chat and IM interfaces, etc. As well as
context menus for avatars and groups in list widgets. Includes fixes
for the following individual JIRAs:
DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)!
DEV-38829 EXT-742: Remove LLLink class
DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly
DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls
DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat
DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw
DEV-10353: URLs in chat log terminated incorrectly when newline in chat
DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs
DEV-36192: Need a way to copy Avatar names and Group names
DEV-2926: Allow viewer hyperlinks to have different text than the actual url
DEV-27253: Add easy way to copy URLs from viewer chat
DEV-38274: Make About Second Life window use new Url hyperlinking features
DEV-39076: No url support in Text Editors
DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access
DEV-7475: Add hyperlinks to notecards!
DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click
Master JIRA issues: DEV-32819, DEV-323820, DEV-7474
Testing performed against QAR-1789
svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
2009-09-04 12:11:27 +00:00
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
7e0f7a0193
attempt at fix for windows build error
...
reviewed by James
2009-08-24 23:50:37 +00:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
89434ef6e6
fix for broken build
2009-08-04 01:39:33 +00:00
eb853f55c0
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-04 01:12:59 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
f5ba6df4c2
svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames
For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER]
For DEV-36563 : Remove mAcceptsCallingCardNames
Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects.
* Test creating landmarks.
Test plans - INTERNAL
* Test against any inventory permissions smoke tests.
* See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
2009-07-24 16:20:15 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
...
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
1aa0416aef
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
...
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
e1d8dac25a
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
...
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
fd46865a50
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
...
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
ac68eb16a2
Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837 to 103519
2008-11-21 01:18:39 +00:00
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
4a6bacea0f
merge viewer/viewer_1-21 94170-94770 -> release
...
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
b9b4a4d934
QAR-782 Merge featurettes batch #2
...
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
ed386ae547
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
...
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
* gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
* featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
* snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)
Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry
* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
9db949eec3
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
...
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
3855896097
EFFECTIVE MERGES:
...
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
d273ba2ce2
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07 20:48:38 +00:00
e1e1212daa
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-05-07 17:17:42 +00:00
36fccc3888
svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa).
2008-04-30 23:30:09 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
42bc4ba02a
merge Branch_1-19-0-Viewer -r 80279 : 80947 -> release
2008-02-28 01:12:38 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
2e32d44e71
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
...
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
d06e5e3519
svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
...
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
7dd08303a3
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-19 00:56:59 +00:00
facf67ae32
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
...
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
ecc4b297e5
svn merge -r 74317:74381 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-26 22:48:22 +00:00
78aec043f3
svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-21 02:10:12 +00:00
c1920e3c1c
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
...
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
2007-11-09 01:56:15 +00:00
7afa8058aa
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
...
QAR-11: pair-reviewed the merge w/ Sam.
2007-11-01 22:02:35 +00:00
5ec8bbbe22
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
2007-10-10 00:01:43 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
cfd17f3322
svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge
2007-10-02 22:38:38 +00:00
b089fc559a
EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
...
** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-28 23:32:53 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
7138fb673a
Merge down from Branch_1-18-1:
...
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-02 01:18:34 +00:00
ce7682c2a4
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
...
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:22:40 +00:00
e03bb0606a
merge -r62831:64079 branches/maintenance to release
2007-06-21 22:40:22 +00:00
f118e7c80b
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-06-13 18:02:37 +00:00
3e9872a297
merge -r61423:62602 svn/branches/maintenance --> release
2007-05-30 17:39:09 +00:00
1c909afe39
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
2007-05-02 21:24:47 +00:00
2ce0fc5f18
svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release
2007-04-05 00:59:55 +00:00
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Ima Mechanique