6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
80447f5e6b
SL-11172 Re-fixed, now should affect 'tab' only
2020-04-13 15:06:11 +03:00
0b6b4c7097
Merge Firestorm LGPL
2019-11-15 19:05:26 +01:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
24acb7d5c3
Fix some line-endings to be newline only.
2019-05-03 14:58:51 -07:00
f67fe8fce7
SL-10833 Restore missing code after a merge
2019-05-02 13:45:40 +03:00
c35758512e
Merge Firestorm LGPL
2019-04-18 13:11:23 +02:00
5f8cca95f8
Merge 6.2.1
2019-04-17 11:24:08 -07:00
856cc1082b
Merge LL viewer-release 6.2.0
2019-04-17 17:12:42 +02:00
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
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
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
34f6702339
FIRE-19933: Open context menu on context menu key press (Windows)
2018-07-13 00:31:07 +02:00
9203b70ca3
Merge viewer-neko
2018-04-07 13:40:21 +02:00
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
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
5ab314bb95
MAINT-8289 FIXED Deleting inventory directory while keeping [Delete] key pressed
2018-02-14 17:55:37 +02:00
2e644b4911
Compile fixes for Xcode 9 (and probably gcc).
2018-01-27 02:02:16 -06:00
c3791746d2
Merge #5 with lgpl.
2017-02-06 12:19:02 +01:00
cd82785561
Fix bug in LLLineEditor where Capslock deselects text, found by Drake Arconis
2016-12-10 12:28:06 +01:00
e2919977d6
Merge viewer-lynx
2016-11-30 11:15:04 +01:00
a3acf2b339
FIRE-20377: LLLineEditor not disabled properly
2016-11-19 10:04:03 +01:00
11c03f8fe3
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-19 16:50:02 +01:00
27a8126dca
Enabling LLLineEditor via XUI breaks enabled-state - correct fix
...
setEnabled intentionally doesn't disable, but is a read-only flag. Make sure
the LLLineEditor is always enabled (calling the base-constructor will disabled it!)
and then call the overloaded setEnabled-Method to apply the read-only flag
2016-11-15 14:28:20 +01:00
6c62088fb8
Enabling LLLineEditor via XUI breaks enabled-state
2016-11-04 18:43:17 +01:00
deb8f582c5
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-16 16:48:56 +02:00
6083fd1cbe
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-07 12:33:14 +02:00
da23e0f925
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
2016-09-13 20:32:34 +03:00
f0366fa155
Merge latest fixes from viewer-vob that didn't get into viewer-release yet
2016-09-15 23:32:34 +02:00
a195406e48
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
2016-09-13 20:32:34 +03:00
c43be9d39b
Merge viewer-lynx
2016-06-15 10:04:29 +02:00
1adfaa081f
MAINT-6446 Correct password length handling
2016-06-01 16:56:04 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
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
a91482f0af
merge changes for MAINT-4790
2015-02-24 10:46:17 -05:00
7bd45ab362
MAINT-4790 WIP Show focused background image for login text fields.
2015-01-19 13:09:24 +02:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
a7e1243c57
FIRE-15763: Right clicking on navigation bar not displaying all menu options
2015-03-23 23:52:53 +01:00
7dad1bdad3
Fix assertion failure in LLLineEditor:
...
The origin of this assertion failure is the changed main_view.xml that will create
the navigation bar from panel_navigation_bar.xml, including 3 LLLineEditors. However,
the menu holder is needed for the context menu of the LLLineEditor is created after
main view has been created. But since we create the context menu for a LLLineEditor
only if required and not when a new instance of LLLineEditor is created, this
assertion failure doesn't affect us and the assertion itself was moved to the
right place where it belongs in our code.
2015-01-21 12:52:33 +01:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
e1ce6e3d58
Merge Firestorm LGPL tip
2015-01-08 23:12:58 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07: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
Ansariel