Ansariel
|
7bef9a1605
|
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-10-12 13:34:36 +02:00 |
|
Andrey Kleshchev
|
bdb4a90e7c
|
SL-16157 Crash at LLFontGL::maxDrawableChars
|
2021-10-08 02:12:36 +03:00 |
|
Zi Ree
|
a52eff1b89
|
Workaround for broken participant list: always show group moderation tools regardless of user permissions, change toggle mute chat to explicit mute and unmute so accidents can no longer happen
|
2021-06-08 15:37:16 +02:00 |
|
Ansariel
|
4841acd297
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-04-17 22:44:52 +02:00 |
|
Ansariel
|
6d26efe266
|
FIRE-30892: Pressing the Home key in the script editor should go to the first non-whitespace character on a line; Contribution by Testicular Slingshot
|
2021-04-03 09:59:07 +02:00 |
|
Ansariel
|
f3961a9510
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-03 20:17:57 +01:00 |
|
Ansariel
|
148e6eede7
|
FIRE-30805: Replace "agentself" with "agent" when copying SLUrls
|
2021-03-03 19:52:34 +01:00 |
|
Ansariel
|
35781178ec
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-02 21:19:39 +01:00 |
|
Ansariel
|
be546fc9a1
|
Fix some XUI parser warnings
|
2021-02-19 10:30:55 +01:00 |
|
Ansariel
|
e4f0270887
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-15 11:41:48 +01:00 |
|
Zi Ree
|
edc771b71a
|
FIRE-30725 - Add more group functions to group URL context menu
|
2021-02-10 14:36:56 +01:00 |
|
Ansariel
|
daec926a54
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 17:02:25 +01:00 |
|
Beq
|
571cf0d5cf
|
FIRE-23523 Notifications with embeded URLs not clickable
|
2020-10-29 15:42:38 +00:00 |
|
Ansariel
|
9f93f28aab
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-10-15 13:07:37 +02:00 |
|
Andrey Lihatskiy
|
b39ad7724f
|
Merge branch 'master' into DRTVWR-515-maint
|
2020-10-14 22:00:20 +03:00 |
|
Andrey Lihatskiy
|
1d458de949
|
Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
|
2020-09-28 22:29:19 +03:00 |
|
Ansariel
|
e6e844a0b9
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 14:01:45 +02:00 |
|
Ansariel
|
41ac9cb015
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 06:52:54 +02:00 |
|
Andrey Kleshchev
|
730af5d488
|
Merged master (DRTVWR-503) into DRTVWR-482
|
2020-09-22 22:51:33 +03:00 |
|
Ansariel
|
240757c0d0
|
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-08-20 16:52:04 +02:00 |
|
Ansariel
|
b67e99e18a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-08-20 10:44:28 +02:00 |
|
Ansariel
|
5f309fdcf7
|
More banging at name SLURL underlining on hover in chat history
|
2020-08-20 00:32:27 +02:00 |
|
Andrey Kleshchev
|
e67e9f63c3
|
SL-13293 Fixed reshape behavior for scale change
|
2020-08-14 01:06:48 +03:00 |
|
Ansariel
|
67255f5d64
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
|
2020-07-29 13:23:00 +02:00 |
|
Ansariel
|
db68f49ab5
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-07-28 21:01:43 +02:00 |
|
Ansariel
|
1dfcb2ddf6
|
Fix chat header color selection
|
2020-07-17 08:38:09 +02:00 |
|
Ansariel
|
6f32a43f08
|
Make avatar names in chat history use default URL font style except it's a moderator in group chat not using default font style
|
2020-07-16 17:51:59 +02:00 |
|
Ansariel
|
a879e86b8e
|
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-19 21:53:26 +02:00 |
|
Ansariel
|
b8f781d2ca
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
|
2020-05-19 14:01:14 +02:00 |
|
Mnikolenko Productengine
|
0828d7375a
|
SL-12396 FIXED Last line can't be removed if it was selected via triple-clicking
|
2020-05-08 11:54:58 +03:00 |
|
Ansariel
|
4e98c504d0
|
FIRE-29545: Backspace not working after triple-click selecting last line
|
2020-05-08 09:32:40 +02:00 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
10552d2459
|
Merge branch 'master' of D:/Dev/phoenix-firestorm-mesh-upload
|
2020-04-23 18:29:50 +02:00 |
|
maxim_productengine
|
44fe667661
|
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
|
2020-04-11 22:48:18 +02:00 |
|
Ansariel
|
48854f714a
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-03-19 10:28:54 +01:00 |
|
Andrey Lihatskiy
|
9ec2aac56c
|
Merge branch 'master' into DRTVWR-482
|
2020-03-18 21:05:33 +02:00 |
|
maxim_productengine
|
b9f0eb54ce
|
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
|
2020-02-12 12:45:56 +02:00 |
|
Ansariel
|
90cbec4a54
|
Merge DRTVWR-481
|
2020-02-08 18:43:22 +01:00 |
|
Andrey Lihatskiy
|
258cc9c61a
|
Merge branch 'master' into DRTVWR-482
|
2020-02-05 18:31:06 +02:00 |
|
Brad Payne (Vir Linden)
|
38649767a0
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481
Merge
|
2020-01-28 21:47:35 +00:00 |
|
Ansariel
|
5f1aaa7108
|
Merge Firestorm LGPL
|
2019-12-13 22:27:53 +01:00 |
|
AndreyL ProductEngine
|
56056aa198
|
Upstream merge from viewer-neko
|
2019-11-27 23:20:03 +02:00 |
|
AndreyL ProductEngine
|
d0c7b4fade
|
Merged in lindenlab/viewer-release
|
2019-11-27 08:19:22 +02:00 |
|
maxim_productengine
|
4acfc99fa6
|
SL-12317 UI Changes to Group limits
|
2019-11-22 18:26:56 +02:00 |
|
Ansariel
|
3bc189bda7
|
Merge Firestorm LGPL
|
2019-11-19 20:28:09 +01:00 |
|
Ansariel
|
c11cb05879
|
Merge Firestorm LGPL
|
2019-11-13 19:35:04 +01:00 |
|
Ansariel
|
fd4b8a7bb1
|
Merge Firestorm LGPL
|
2019-11-12 18:45:02 +01:00 |
|
AndreyL ProductEngine
|
5f731d84cb
|
Downstream merge from 494-maint-wassail
|
2019-11-12 02:37:15 +02:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
|
Ansariel
|
e8b426d1c2
|
Merge viewer-neko
|
2019-09-11 17:34:55 +02:00 |