Ansariel
a9c29b4b81
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmenugl.h
# indra/llui/lltexteditor.cpp
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llnetmap.cpp
2022-10-20 10:51:25 +02:00
Ansariel
603e04ee3c
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 13:18:55 +02:00
Andrey Lihatskiy
5aec46243b
Merge branch 'master' into DRTVWR-540-maint
2021-06-25 01:02:22 +03:00
Andrey Kleshchev
7c179b8e7d
SL-15346 Small adjustment
2021-06-07 21:19:47 +03:00
Andrey Kleshchev
024032c674
SL-15346 "Listing ID" field has OS-dependent length restriction
2021-06-05 00:22:20 +03:00
Ansariel
b677e01629
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2020-09-23 19:02:19 +02:00
Mnikolenko Productengine
bc07bc526c
SL-13852 Add visibility options to inventory search results
2020-09-23 11:32:14 +03:00
Ansariel
c35758512e
Merge Firestorm LGPL
2019-04-18 13:11:23 +02:00
Graham Linden
5f8cca95f8
Merge 6.2.1
2019-04-17 11:24:08 -07:00
Ansariel
856cc1082b
Merge LL viewer-release 6.2.0
2019-04-17 17:12:42 +02:00
andreykproductengine
d1b649055d
SL-10890 Ban duration edit field shows value with a left shift if a large value was set
2019-04-05 22:42:04 +03:00
Ansariel
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
maxim_productengine
3a78da70ad
SL-10833 FIXED [EEP] Text in the Sky Altitudes boxes is low contrast and difficult to read.
2019-03-29 17:39:19 +02:00
Ansariel
34f6702339
FIRE-19933: Open context menu on context menu key press (Windows)
2018-07-13 00:31:07 +02:00
Ansariel
9203b70ca3
Merge viewer-neko
2018-04-07 13:40:21 +02:00
maxim_productengine
83de982be9
MAINT-8488 FIXED Favourite location list on login screen is not updated after pressing "Esc" key while in username field
2018-04-05 18:22:15 +03:00
Ansariel
e2919977d6
Merge viewer-lynx
2016-11-30 11:15:04 +01:00
Ansariel
11c03f8fe3
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-19 16:50:02 +01:00
Ansariel
a3acf2b339
FIRE-20377: LLLineEditor not disabled properly
2016-11-19 10:04:03 +01:00
Ansariel
f0366fa155
Merge latest fixes from viewer-vob that didn't get into viewer-release yet
2016-09-15 23:32:34 +02:00
andreykproductengine
da23e0f925
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
2016-09-13 20:32:34 +03:00
andreykproductengine
a195406e48
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
2016-09-13 20:32:34 +03:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Ansariel
adb6c935d2
Add linefeed input support to chat textboxes via Ctrl-Shift-Enter
2015-07-10 14:47:01 +02:00
Nicky
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
Ansariel
647245f226
Fix possible memory leak in LLLineEditor when assigning a context menu while LLMenuGL::sMenuContainer is still null
2015-04-22 15:07:08 +02:00
Mnikolenko ProductEngine
7bd45ab362
MAINT-4790 WIP Show focused background image for login text fields.
2015-01-19 13:09:24 +02:00
Ansariel
00bfbfae2b
Tag Firestorm-specific code in last commit
2014-10-28 22:39:16 +01:00
Lirusaito
caa86284e1
Ctrl-Backspace and Ctrl-Delete for removing whole words when editing text
2014-08-27 00:04:47 -04:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Cho
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
Tonya Souther
04fce8550a
FIRE-11373: AUtoreplace doesn't work in nearby chat bar
2013-08-25 22:35:52 -05:00
Tank_Master
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
Tank_Master
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
Tank_Master
660eb3a383
changed max_length to max_length_chars for max_length is not a valid perameter,
...
increased max possible imput to 4096 from 254
2012-09-03 23:24:21 -07:00
Tank_Master
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
Tank_Master
0d4ca6478f
removed spellcheck, to be replaced by LL's version
2012-07-10 23:57:05 -07:00
Tank_Master
0d52c043d4
remove autocorrect, to be replaced by Auto Replace from LL
2012-07-09 23:30:54 -07:00
Oz Linden
925db41711
merge changes for storm-276
2012-05-31 14:26:15 -04:00
Oz Linden
9bdb1d82f8
rename feature from "autocorrect" to "autoreplace", change names accordingly
2012-05-11 12:22:43 -04:00
Jonathan Yap
22f26725b9
STORM-1738 Autocorrect working for nearby chat and IM input boxes
...
warn-on-failure:open-license
2012-02-10 17:40:58 -05:00
Kitty Barnett
41e11a5083
STORM-276 FIXED Selecting a character in a line editor and replacing it doesn't trigger a spell check
2012-02-03 15:34:52 +01:00
Jonathan Yap
4778d82ec6
STORM-1738 Initial callback work
...
warn-on-failure:open-license
2012-02-01 10:16:13 -05:00
Kitty Barnett
f0d1afc226
STORM-276 Added spellcheck functionality to the LLLineEditor control
2012-01-20 18:07:35 +01:00
Tank_Master
1cc154166f
STORM-1738 - Add autocorrect functionality
...
Ported with owner permission from Firestorm, inital work done by LordGregGreg Back
2011-12-20 22:17:20 -08:00
Nicky
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
Nicky
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
Richard Nelson
09e179b238
param block cleanup
...
added Flag as value type
moved Batch to BatchBlock
renamed Choice to ChoiceBlock
made merging of parameters for ValueParams consistent (fillFrom and overwriteFrom are inverses of each other now)
made iteration over Multiple<T> type params easier
initial schema param blocks
2011-09-30 16:57:08 -07:00
Oz Linden
44c7c6feaa
merge changes for storm-1315
2011-07-11 16:52:00 -04:00