Andrey Lihatskiy
|
5d7a5001b4
|
Merge commit '9e24b30' into marchcat/maint-c/restore
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
|
2025-04-10 06:01:50 +03:00 |
|
Ansariel Hiller
|
d9da5bbb33
|
Remove quads rendering mode entirely (#2593)
|
2024-09-18 17:09:51 +03:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02:00 |
|
Andrey Kleshchev
|
db3f7eafa0
|
viewer#1588 Upload directly to Specified Inventory Folder
|
2024-06-04 19:24:02 +03:00 |
|
Ansariel
|
b42f9d836b
|
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
|
2024-06-01 15:49:26 +02:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Andrey Kleshchev
|
741b79d63b
|
viewer#1529 Mesh Uploader should permit lowering material count
|
2024-05-22 11:10:17 +03:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Andrey Lihatskiy
|
67a9d88646
|
viewer#855 Xcode buildfix
|
2024-02-22 00:14:41 +02:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Ansariel
|
c285f59ce2
|
Replace BOOL with bool in llwindow and dependent classes
|
2024-02-18 15:51:54 +02:00 |
|
Brad Linden
|
5fabfa50d7
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-02-02 12:11:40 -08:00 |
|
Rye Mutt
|
d0e07c770b
|
Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type.
|
2022-10-30 06:56:16 -04:00 |
|
Andrey Kleshchev
|
24fb2f8336
|
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
|
2022-10-21 18:19:27 +03:00 |
|
Andrey Kleshchev
|
7649114588
|
Merge branch master (DRTVWR-571) into DRTVWR-559
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
|
2022-09-16 21:07:39 +03:00 |
|
Andrey Lihatskiy
|
329268c5f7
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llmodelpreview.h
|
2022-09-15 20:44:04 +03:00 |
|
Brad Kittenbrink
|
38208441db
|
Merge remote-tracking branch 'origin/master' into DRTVWR-559
|
2022-08-04 10:59:26 -07:00 |
|
Andrey Lihatskiy
|
59ab8e78f4
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
|
2022-08-04 00:17:55 +03:00 |
|
Andrey Lihatskiy
|
ea26ee5e92
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
|
2022-08-04 00:15:36 +03:00 |
|
Andrey Kleshchev
|
b08340f183
|
SL-17475 Remap models before simplification
|
2022-06-11 10:23:46 +03:00 |
|
Dave Houlton
|
8c0163bcb4
|
SL-17214 initial loader class skeleton
|
2022-06-08 13:33:59 -06:00 |
|
Andrey Lihatskiy
|
9b0569840f
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
|
2022-05-31 01:58:09 +03:00 |
|
Andrey Lihatskiy
|
91606c7b60
|
Merge branch 'master' into DRTVWR-548-maint-N
|
2022-05-26 03:07:05 +03:00 |
|
Dave Parks
|
6eaf8521ab
|
SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render.
|
2022-05-20 19:05:28 -05:00 |
|
Mnikolenko Productengine
|
ab9a221229
|
SL-17147 Disable simplification UI after calculating fee
|
2022-04-05 18:37:40 +03:00 |
|
Howard Stearns
|
340213b302
|
SL-9748 - Only supply a default physics shape if it is named default_physics_shape
|
2022-03-03 18:56:52 -08:00 |
|
Howard Stearns
|
239a29ab5c
|
SL-9748 - more cases
|
2022-03-02 17:39:12 -08:00 |
|
Andrey Kleshchev
|
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 |
|
Howard Stearns
|
130d0c0704
|
Merge branch 'master' of bitbucket.org:lindenlab/viewer into SL-9749
|
2022-02-28 15:54:23 -08:00 |
|
Howard Stearns
|
4e88caf9c6
|
SL-9748 - coding standard
|
2022-02-22 10:51:18 -08:00 |
|
Howard Stearns
|
ab39432109
|
SL-9748 - Option to compute uploaded mesh physics shape from a cube.
|
2022-02-22 09:47:43 -08:00 |
|
Andrey Kleshchev
|
38e77cb958
|
SL-16614 Viewer's uploader crash with RenderGLCoreProfile
|
2022-01-12 20:01:36 +02:00 |
|
Dave Houlton
|
cf35d27dfb
|
DRTVWR-546 merge up to 6.5.2
|
2021-12-15 14:37:18 -07:00 |
|
Andrey Lihatskiy
|
edb6293528
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-12-15 21:50:40 +02:00 |
|
Andrey Kleshchev
|
9e38e5a187
|
SL-16471 Removed unneeded MeshOpt generation method
|
2021-12-09 00:33:57 +02:00 |
|
Andrey Kleshchev
|
27e4e245d9
|
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
|
2021-11-29 20:33:13 +02:00 |
|
Andrey Kleshchev
|
33f52ee51d
|
SL-14403 Removed glod
|
2021-11-10 17:48:55 +02:00 |
|
Dave Parks
|
f79890669d
|
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
|
2021-09-20 18:58:09 +00:00 |
|
Andrey Kleshchev
|
1a17932440
|
DRTVWR-542 Automated method selection
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
|
2021-08-04 21:14:00 +03:00 |
|
Andrey Kleshchev
|
7235d333ea
|
DRTVWR-542 Fix incorect dropbox state
|
2021-08-04 00:15:49 +03:00 |
|
Andrey Kleshchev
|
9aaac1bb98
|
DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces
|
2021-07-23 21:30:13 +03:00 |
|
Andrey Kleshchev
|
938969c811
|
DRTVWR-542 WIP #6
Trying out 'sloppy' variant
|
2021-07-12 19:18:25 +03:00 |
|
Andrey Kleshchev
|
17131ac203
|
DRTVWR-542 WIP #4
Made meshoptimizer into default generation mechanism
Ensured that at least one triangle will remain of any face
|
2021-07-11 22:39:42 +03:00 |
|
Andrey Kleshchev
|
7b7b8a8da8
|
DRTVWR-542 WIP
|
2021-07-07 22:40:37 +03:00 |
|
Callum Prentice
|
ad9ed0a94d
|
Merge with tip of Master after Viewer release
|
2021-06-07 18:55:00 -07:00 |
|
Andrey Lihatskiy
|
3c40a833ef
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-06-07 21:05:04 +03:00 |
|
Andrey Kleshchev
|
021cf914af
|
SL-15159 Removed dead yet expensive code
"prim_cost" and "description_label" do not appear to be in use, other cost data not in use
|
2021-05-04 23:59:02 +03:00 |
|
Andrey Kleshchev
|
f3806a4a05
|
SL-15159 Switching uploader to 'load from file' causes a small freeze even if empty
|
2021-04-30 19:37:26 +03:00 |