Ansariel
|
3c16b5d369
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-10-15 15:12:16 +02: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
|
efbb274251
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 07:33:20 +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
|
6578b9420d
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-07-28 20: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 |
|
Ansariel
|
f7ab3b2f4b
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
|
2020-05-19 12:26:21 +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 |
|
Ansariel
|
ddc7fc297b
|
Merge branch 'master' of D:/Dev/phoenix-firestorm-legacy-profiles
|
2020-04-23 18:08:09 +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 |
|
Ansariel
|
fc5f901ff5
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-03-19 09:29:44 +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 |
|
Ansariel
|
f686d4f329
|
Merge viewer-legacy-profiles
|
2019-12-13 00:56:12 +01:00 |
|
Ansariel
|
8f3213d7d4
|
Merge Firestorm LGPL
|
2019-12-13 00:14:24 +01:00 |
|
maxim_productengine
|
3d5ffd0af3
|
SL-12003 FIXED Viewer Icons do not display in Profiles
|
2019-12-02 16:28:13 +02: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 |
|
AndreyL ProductEngine
|
f83ada32f7
|
Merged in lindenlab/viewer-release
|
2019-11-13 10:50:25 +02:00 |
|
Ansariel
|
229a6928e9
|
Merge Firestorm LGPL
|
2019-11-12 23:22:39 +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 |
|
andreykproductengine
|
98b28e5881
|
SL-11910 [Win] Horizontal scroll
|
2019-09-10 19:49:15 +03:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03:00 |
|
Ansariel
|
69f14e2f29
|
Initial merge of viewer-legacy-profiles
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
|
2019-07-19 11:21:54 +02:00 |
|
Ansariel
|
a63693b454
|
Merge mesh upload changes
|
2019-05-11 13:12:11 +02:00 |
|
AndreyL ProductEngine
|
3175525950
|
Merged in lindenlab/viewer-release
|
2019-05-08 21:41:56 +03:00 |
|
AndreyL ProductEngine
|
93f0023efa
|
Merged in lindenlab/viewer-release
|
2019-05-08 21:41:11 +03:00 |
|
andreykproductengine
|
9d2cb130e3
|
SL-11028 [Legacy Profiles] Selection in account field is malfunctioning
|
2019-04-25 23:03:18 +03:00 |
|
andreykproductengine
|
580b35c8ea
|
SL-307 Display in-viewer all warning messages logged by the mesh uploader
|
2019-04-01 20:22:25 +03:00 |
|
Ansariel
|
dd2636a2c2
|
Merge viewer-neko
|
2019-01-10 21:10:36 +01:00 |
|
AndreyL ProductEngine
|
09b750483a
|
SL-10293 Firestorm PR: preferences and menu search
|
2019-01-03 22:59:49 +02:00 |
|
Ansariel
|
95fcf065c1
|
Merge viewer-bear
|
2017-04-19 21:43:58 +02:00 |
|
andreykproductengine
|
b7c909367e
|
MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors.
|
2017-04-06 21:29:43 +03:00 |
|
Mnikolenko Productengine
|
bf850c110b
|
MAINT-7224 Chat logs move down, leaving huge empty space
|
2017-03-21 16:18:23 +02:00 |
|
Mnikolenko Productengine
|
eddcb43851
|
MAINT-7224 Chat logs move down, leaving huge empty space
|
2017-03-21 16:18:23 +02:00 |
|
Ansariel
|
dd69a22834
|
Merge viewer-bear
|
2017-01-27 09:42:51 +01:00 |
|
andreykproductengine
|
8ef99c38a5
|
MAINT-918 Newline was not displayed correctly in chat window.
|
2017-01-04 18:38:52 +02:00 |
|
Ansariel
|
b658e3cce5
|
FIRE-20214: Text gets deselected upon avatar/group name received callback
|
2016-10-10 13:02:22 +02: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 |
|
andreykproductengine
|
ff118b7d21
|
MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase
|
2016-09-12 17:45:12 +03:00 |
|
andreykproductengine
|
50ed0db1ff
|
MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase
|
2016-09-12 17:45:12 +03:00 |
|
Ansariel
|
d48538d3ab
|
Merge viewer-lion
|
2016-05-24 08:42:12 +02:00 |
|
Ansariel
|
71f1707b99
|
Merge viewer-lion
|
2016-05-23 17:41:19 +02:00 |
|
andreykproductengine
|
efa716b5fc
|
MAINT-2129 "Block" button doesn't become disabled
|
2016-05-18 19:29:31 +03:00 |
|
andreykproductengine
|
d37003a631
|
MAINT-2129 signuls cleanup
|
2016-05-23 18:06:16 +03:00 |
|
Ansariel
|
a0188a5358
|
Merge Firestorm LGPL
|
2016-05-09 12:41:24 +02:00 |
|
Oz Linden
|
950c41d184
|
merge 4.0.4-release and MAINT-5974
|
2016-05-06 10:28:42 -04:00 |
|
Ansariel
|
743e0c0097
|
Merge Firestorm LGPL tip
|
2016-04-23 12:27:34 +02:00 |
|
Ansariel
|
9cd3d79b20
|
Merge Firestorm LGPL tip
|
2016-04-23 11:53:52 +02:00 |
|
Ansariel
|
33b1d5efa0
|
Dump FSFixCursorPosition and workaround fix for cursor position being off now there is a fix by LL and since FSFixCursorPosition has been disabled by default for over 3 years anyway
|
2016-04-22 17:05:24 +02:00 |
|
Ansariel
|
d171e16c58
|
Merge Firestorm LGPL
|
2016-03-18 10:16:25 +01:00 |
|
Ansariel
|
08a3c121ca
|
Build fix
|
2016-03-17 23:41:57 +01:00 |
|
Ansariel
|
1bba3dfbe4
|
Merge viewer-bear
|
2016-03-17 21:14:49 +01:00 |
|
Oz Linden
|
31f3db0291
|
merge changes for DRTVWR-417
|
2016-03-16 13:08:06 -04:00 |
|
andreykproductengine
|
230fc28d8a
|
MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu
|
2016-03-11 20:16:03 +02:00 |
|
Ansariel
|
3192fe832f
|
Merge viewer-quickgraphics
|
2016-03-08 01:41:31 +01:00 |
|
Oz Linden
|
5822fb00b6
|
merge DRTVWR-398 build cleanup fixes
|
2016-03-07 12:41:11 -05:00 |
|
Ansariel
|
e7ade840e4
|
Merge viewer-bear
|
2016-01-24 14:00:30 +01:00 |
|
andreykproductengine
|
c73d9e5c44
|
MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0
|
2015-12-29 20:20:40 +02:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Ansariel
|
83862ed91a
|
Merge Firestorm tip
|
2015-10-15 11:02:30 +02:00 |
|
Oz Linden
|
69ff937e47
|
merge changes for 3.8.5-release
|
2015-10-13 08:43:03 -04:00 |
|
Ansariel
|
5524d38dff
|
Merge viewer-quickgraphics
|
2015-10-03 16:38:26 +02:00 |
|
Ansariel
|
5fe09cb64d
|
Merge Viewer-Bear
|
2015-08-22 03:13:17 +02:00 |
|
Mnikolenko ProductEngine
|
4ab4c6da02
|
MAINT-5463 FIXED Add hovertext to the official link badge in chat/IM, etc.
|
2015-08-10 11:15:50 +03:00 |
|
Oz Linden
|
71a468c6fb
|
merge changes for other open sourc contributions
|
2015-07-30 11:09:00 -04:00 |
|
Mnikolenko ProductEngine
|
07020ffce0
|
MAINT-5428 FIXED Show tooltip for both parts of url.
|
2015-07-29 12:35:54 +03:00 |
|
AndreyL ProductEngine
|
e62d5ea4e8
|
MAINT-5019 FIXED Undesired "http://" added to domains sent in chat
Completely removed matching of the URLs w/o a protocol
+ Some unit tests
|
2015-07-29 07:35:08 +03:00 |
|
Oz Linden
|
034fb74d05
|
merge changes for STORM-2113
|
2015-04-14 05:39:36 -04:00 |
|
Oz Linden
|
a8ef252571
|
merge changes for 3.7.27-release
|
2015-04-13 16:23:36 -04:00 |
|
Cinder
|
5a282abe18
|
STORM-2113 - uri parsing cleanup and fixes
|
2015-04-11 15:23:06 -06:00 |