6ee5d6053f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/skins/default/xui/de/notifications.xml
2023-07-18 10:22:07 +02:00
7bcb251661
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llmessage/llcoproceduremanager.cpp
# indra/llui/lllayoutstack.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorymodelbackgroundfetch.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-04-21 12:08:40 +02:00
81d69cf84d
SL-19379 WIP add worn suffix, use bold font style for worn items and italic for links
2023-03-31 13:40:59 +03:00
5baeb998eb
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
2023-03-30 13:08:32 +02:00
d1b414e48b
SL-17045 LSL editor cursor position desynchronization
2023-03-24 22:17:36 +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
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
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +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
2238f89db7
SL-16141 Load fonts and generate glyphs on startup
2021-10-11 18:05:27 +03:00
5326c9cdb0
FIRE-30833: Add Cascadia Code font both as option for the UI as for the script editor
2021-03-20 13:45:54 +01:00
f92c1ffdb4
Merge viewer-neko
2019-05-21 20:18:40 +02:00
3adc5c2b50
Merge viewer-neko
2019-03-26 19:15:36 +01:00
fd7b0e19da
SL-10610 FIXED Floaters fails to display certain symbols. Added ability to load font collections.
2019-03-19 11:16:24 +02:00
a399c67785
Merge viewer-bugsplat
2019-02-26 23:00:48 +01:00
4b99e6a1f1
SL-10252: On Windows, use $SystemRoot again, not FOLDERID_Fonts.
2018-12-17 15:23:57 -05:00
8b6392c0aa
Merge viewer-bugsplat
2018-12-16 13:04:08 +01:00
4a13657285
SL-10153: auto name{expression} declares an initializer_list
...
instead of a variable of type decltype(expression).
Using SHGetKnownFolderPath(FOLDERID_Fonts) in LLFontGL::getFontPathSystem()
requires new Windows #include files.
A variable with a constructor can't be declared within the braces of a switch
statement, even outside any of its case clauses.
2018-12-15 09:13:24 -05:00
c4096f670c
SL-10153: Review and rationalize fetching paths from environment.
...
Use LLStringUtil::getenv() or getoptenv() whenever we fetch a string that will
be used as a pathname.
Use LLFile::tmpdir() instead of getenv("TEMP").
As an added extra-special bonus, finally clean up $TMP/llcontrol-test-zzzzzz
directories that have been accumulating every time we run a local build!
2018-12-14 15:38:13 -05:00
f46969fec7
SL-11139 FIXED LLFontGL::getStringFromStyle() never return "NORMAL"
2019-05-13 18:17:16 +03:00
318b5e53aa
FIRE-20818: User-selectable font and size for script editor
2018-02-01 10:34:13 +01:00
c306e7ad5c
Fix script editor ignoring font selection and make it actually use Source Code Pro font
2017-11-27 16:41:40 +01:00
d19b330deb
Fix vertex windings
2017-03-10 21:31:56 +01:00
0c4c1b5968
Remove deprecated OpenGL QUADS rendering mode
2017-03-04 23:57:37 +01:00
00fc34a62f
MAINT-6683 fixed wrapping issues of notecard embedded items
2016-08-30 20:13:45 +03:00
a00165aad4
MAINT-6683 fixed wrapping issues of notecard embedded items
2016-08-30 20:13:45 +03:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01: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
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +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
2c78c1935f
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
2014-10-17 15:45:18 -07:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
e7a4cce356
CHUI-846 FIXED [crashhunters] crash in LLFontGL::maxDrawableChars
2013-03-12 00:41:35 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
572456971b
Proper support for using Source Code and OCR-A fonts
2013-05-18 12:42:48 -06:00
698b056af4
Indention fix
2013-05-11 13:53:19 +02:00
Ansariel