49c8ce2b07
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-30 14:53:12 +02:00
627c7de801
SL-19134 Some texture related adjustments
2023-02-07 12:36:20 +02:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02:00
e0cf0cdfd4
Switch to target_include_directories
...
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09 14:39:51 -08:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
d9448c6f52
The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-17 09:45:06 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
d3c2ab5817
Be sure the correct include is included.
2015-08-19 12:39:51 -07:00
afff2d12b8
See if this helps the linux build. If not change will be needed to viewer-update-llapearance-utility repo
2015-08-18 11:40:24 -07:00
21df924a10
Building headless and non-headless libraries side-by-side, removing the need for the BAKING cmake setting.
2012-10-04 06:29:07 +00:00
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
7a4618544f
Automated merge
2012-09-08 04:40:18 +00:00
cf7eb79fa7
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-08 04:39:11 +00:00
77b33d9623
SH-3264 Porting over the XML loading of the avatar structure to llappearance
...
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
2012-09-07 23:17:34 -04:00
85d0bcc063
Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-06 02:53:55 +00:00
41301004e1
Cleanup actions from code review of llappearance with nyx
2012-09-04 22:49:26 +00:00
21c364c4d4
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
2012-09-03 09:10:24 +00:00
1bd5fd8c50
Fixed typo in cmake file
2012-09-03 07:00:56 +00:00
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00
51fabc3850
SH-3261 SH-3324 WIP Starting extraction of wearable/appearance libraries
...
First pass at cmake configs, and starting to try to move wearable class.
Things are broken, checkpointing work to collaborate.
2012-08-21 18:21:11 -04:00
Ansariel