ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
e70fe3a50d
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2022-02-28 22:01:18 +02:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
6638d1d367
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-26 12:31:20 +01:00
e129986a49
SL-3007 Ability to report abuse from chat
2022-01-24 23:37:21 +02:00
9c3cdd37f3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-16 13:43:53 +01:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
b70614bd87
SL-16606: Add profiler category UI
2022-01-14 11:50:21 -08:00
78f9a28191
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2022-01-13 21:12:09 +01:00
453c99af39
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-01-10 23:15:08 +01:00
9c0973f787
FIRE-31179: Fix double-clicking on friend list item might execute underlying URL in opened IM window
2022-01-04 15:00:41 +01:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
be25e64888
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 13:54:22 +01:00
981cdca0a5
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:34:29 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
7bef9a1605
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 13:34:36 +02:00
bdb4a90e7c
SL-16157 Crash at LLFontGL::maxDrawableChars
2021-10-08 02:12:36 +03:00
3c1d189bb8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 09:26:10 +02:00
40e8c0a192
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 18:58:22 +02:00
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
f655bb1f27
Merge branch master (DRTVWR-515) into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-05-06 22:13:40 +03:00
9768f25de0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 02:08:40 +02:00
bc76d48967
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 09:32:45 +02:00
e5a428f362
Merge branch 'master' into DRTVWR-521-maint
2021-04-30 03:00:32 +03:00
4841acd297
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-17 22:44:52 +02:00
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
914f8988db
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-04 09:12:20 +01:00
e3cb162f51
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-03 22:05:58 +01:00
f3961a9510
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-03 20:17:57 +01:00
148e6eede7
FIRE-30805: Replace "agentself" with "agent" when copying SLUrls
2021-03-03 19:52:34 +01:00
35781178ec
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-02 21:19:39 +01:00
be546fc9a1
Fix some XUI parser warnings
2021-02-19 10:30:55 +01:00
fd06acc270
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 21:22:24 +01:00
47d9576f04
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 19:16:15 +01:00
e4f0270887
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 11:41:48 +01:00
edc771b71a
FIRE-30725 - Add more group functions to group URL context menu
2021-02-10 14:36:56 +01:00
daec926a54
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:02:25 +01:00
602a82dc33
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 10:11:43 +01:00
22b2d0d4e0
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-04 15:33:34 +01:00
571cf0d5cf
FIRE-23523 Notifications with embeded URLs not clickable
2020-10-29 15:42:38 +00:00
a74cadff83
SL-14149 FIXED The text is displayed black after double-clicking on it
2020-10-23 16:05:31 +03:00
3c16b5d369
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 15:12:16 +02:00
9f93f28aab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 13:07:37 +02:00
42330f2008
Merge branch 'master' into DRTVWR-483
2020-10-14 22:01:05 +03:00
b39ad7724f
Merge branch 'master' into DRTVWR-515-maint
2020-10-14 22:00:20 +03:00
1d458de949
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
e6e844a0b9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 14:01:45 +02:00
efbb274251
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 07:33:20 +02:00
41ac9cb015
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 06:52:54 +02:00
f4bfaeb45e
Merge branch 'master' into DRTVWR-483
2020-09-23 01:48:13 +03:00
730af5d488
Merged master (DRTVWR-503) into DRTVWR-482
2020-09-22 22:51:33 +03:00
240757c0d0
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-20 16:52:04 +02:00
b67e99e18a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-20 10:44:28 +02:00
5f309fdcf7
More banging at name SLURL underlining on hover in chat history
2020-08-20 00:32:27 +02:00
e67e9f63c3
SL-13293 Fixed reshape behavior for scale change
2020-08-14 01:06:48 +03:00
67255f5d64
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-07-29 13:23:00 +02:00
db68f49ab5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-28 21:01:43 +02:00
6578b9420d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-28 20:01:43 +02:00
1dfcb2ddf6
Fix chat header color selection
2020-07-17 08:38:09 +02:00
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
a879e86b8e
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-19 21:53:26 +02:00
b8f781d2ca
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-19 14:01:14 +02:00
f7ab3b2f4b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-19 12:26:21 +02:00
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
4e98c504d0
FIRE-29545: Backspace not working after triple-click selecting last line
2020-05-08 09:32:40 +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
10552d2459
Merge branch 'master' of D:/Dev/phoenix-firestorm-mesh-upload
2020-04-23 18:29:50 +02:00
ddc7fc297b
Merge branch 'master' of D:/Dev/phoenix-firestorm-legacy-profiles
2020-04-23 18:08:09 +02:00
44fe667661
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-04-11 22:48:18 +02:00
48854f714a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-03-19 10:28:54 +01:00
fc5f901ff5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-03-19 09:29:44 +01:00
dcb6b5489d
Merge branch 'master' into DRTVWR-483
2020-03-18 21:06:02 +02:00
9ec2aac56c
Merge branch 'master' into DRTVWR-482
2020-03-18 21:05:33 +02:00
b9f0eb54ce
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-02-12 12:45:56 +02:00
90cbec4a54
Merge DRTVWR-481
2020-02-08 18:43:22 +01:00
d956c866cf
Merge branch 'master' into DRTVWR-483
2020-02-05 18:33:53 +02:00
258cc9c61a
Merge branch 'master' into DRTVWR-482
2020-02-05 18:31:06 +02:00
38649767a0
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481
...
Merge
2020-01-28 21:47:35 +00:00
5f1aaa7108
Merge Firestorm LGPL
2019-12-13 22:27:53 +01:00
f686d4f329
Merge viewer-legacy-profiles
2019-12-13 00:56:12 +01:00
8f3213d7d4
Merge Firestorm LGPL
2019-12-13 00:14:24 +01:00
3d5ffd0af3
SL-12003 FIXED Viewer Icons do not display in Profiles
2019-12-02 16:28:13 +02:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
d0c7b4fade
Merged in lindenlab/viewer-release
2019-11-27 08:19:22 +02:00
4acfc99fa6
SL-12317 UI Changes to Group limits
2019-11-22 18:26:56 +02:00
3bc189bda7
Merge Firestorm LGPL
2019-11-19 20:28:09 +01:00
c11cb05879
Merge Firestorm LGPL
2019-11-13 19:35:04 +01:00
f83ada32f7
Merged in lindenlab/viewer-release
2019-11-13 10:50:25 +02:00
229a6928e9
Merge Firestorm LGPL
2019-11-12 23:22:39 +01:00
fd4b8a7bb1
Merge Firestorm LGPL
2019-11-12 18:45:02 +01:00
5f731d84cb
Downstream merge from 494-maint-wassail
2019-11-12 02:37:15 +02:00
d58b530e80
Add text_valign to LLTextBase to specify the vertical alignment within a single document line The existing font_valign property is used as to position the entire document so it's impossible to top align a text editor with each line's text centered within that line's extents
2019-11-07 20:48:20 +01:00
b44ade68e6
FIXED Calling LLTextBase::insertStringNoUndo() with more than one segment results in overlapping segment ranges
...
Text is only inserted into the view model *after* the segments are added so if seg1_pos_start is the current EOF:
-> 1st segment: getSegIterContaining(seg1_pos_start) returns the last segment and insertSegment() ends up properly adjusting its start/end position
-> 2nd segment: getSegIterContaining(seg2_pos_start) returns mSegments.end() since its position is beyond the available and insertSegment() leaves the last 2 segments with overlapping ranges
After the fix:
-> if index runs past the end of all segments then mSegments.end() is returned (no change)
-> if index is a position past the length of text but claimed by a segment then that segment is returned (change)
-> if index specifies a position in the middle of the document unclaimed by any segment then the first segment after that position is returned (no change)
(this does break the assertion that segment->mStart <= index <= segment->mEnd?)
2019-11-07 20:33:53 +01:00
418308bc7c
Characters can have more than one representation in LLFontFreetype
...
* By default all viewer text will use B/W glyphs
* Added temporary use_color attribute to LLTextBase for testing
2019-11-06 12:34:26 +01:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
e8b426d1c2
Merge viewer-neko
2019-09-11 17:34:55 +02:00
98b28e5881
SL-11910 [Win] Horizontal scroll
2019-09-10 19:49:15 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
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
a63693b454
Merge mesh upload changes
2019-05-11 13:12:11 +02:00
3175525950
Merged in lindenlab/viewer-release
2019-05-08 21:41:56 +03:00
93f0023efa
Merged in lindenlab/viewer-release
2019-05-08 21:41:11 +03:00
9d2cb130e3
SL-11028 [Legacy Profiles] Selection in account field is malfunctioning
2019-04-25 23:03:18 +03:00
580b35c8ea
SL-307 Display in-viewer all warning messages logged by the mesh uploader
2019-04-01 20:22:25 +03:00
dd2636a2c2
Merge viewer-neko
2019-01-10 21:10:36 +01:00
09b750483a
SL-10293 Firestorm PR: preferences and menu search
2019-01-03 22:59:49 +02:00
95fcf065c1
Merge viewer-bear
2017-04-19 21:43:58 +02:00
b7c909367e
MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors.
2017-04-06 21:29:43 +03:00
bf850c110b
MAINT-7224 Chat logs move down, leaving huge empty space
2017-03-21 16:18:23 +02:00
eddcb43851
MAINT-7224 Chat logs move down, leaving huge empty space
2017-03-21 16:18:23 +02:00
dd69a22834
Merge viewer-bear
2017-01-27 09:42:51 +01:00
8ef99c38a5
MAINT-918 Newline was not displayed correctly in chat window.
2017-01-04 18:38:52 +02:00
b658e3cce5
FIRE-20214: Text gets deselected upon avatar/group name received callback
2016-10-10 13:02:22 +02:00
f0366fa155
Merge latest fixes from viewer-vob that didn't get into viewer-release yet
2016-09-15 23:32:34 +02:00
da23e0f925
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
2016-09-13 20:32:34 +03:00
a195406e48
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
2016-09-13 20:32:34 +03:00
ff118b7d21
MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase
2016-09-12 17:45:12 +03:00
50ed0db1ff
MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase
2016-09-12 17:45:12 +03:00
d48538d3ab
Merge viewer-lion
2016-05-24 08:42:12 +02:00
71f1707b99
Merge viewer-lion
2016-05-23 17:41:19 +02:00
efa716b5fc
MAINT-2129 "Block" button doesn't become disabled
2016-05-18 19:29:31 +03:00
d37003a631
MAINT-2129 signuls cleanup
2016-05-23 18:06:16 +03:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
743e0c0097
Merge Firestorm LGPL tip
2016-04-23 12:27:34 +02:00
9cd3d79b20
Merge Firestorm LGPL tip
2016-04-23 11:53:52 +02:00
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
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
08a3c121ca
Build fix
2016-03-17 23:41:57 +01:00
1bba3dfbe4
Merge viewer-bear
2016-03-17 21:14:49 +01:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
230fc28d8a
MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu
2016-03-11 20:16:03 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
c73d9e5c44
MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0
2015-12-29 20:20:40 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
83862ed91a
Merge Firestorm tip
2015-10-15 11:02:30 +02:00
69ff937e47
merge changes for 3.8.5-release
2015-10-13 08:43:03 -04:00
5524d38dff
Merge viewer-quickgraphics
2015-10-03 16:38:26 +02:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
4ab4c6da02
MAINT-5463 FIXED Add hovertext to the official link badge in chat/IM, etc.
2015-08-10 11:15:50 +03:00
71a468c6fb
merge changes for other open sourc contributions
2015-07-30 11:09:00 -04:00
07020ffce0
MAINT-5428 FIXED Show tooltip for both parts of url.
2015-07-29 12:35:54 +03:00
Ansariel