Commit Graph

63 Commits (e0d14e02e152b4e75ff8bdd974677f9669163d68)

Author SHA1 Message Date
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 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
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
RunitaiLinden 6f5f16e031 SL-19655 Remove concept of "low priority" updates (RenderDebugGLSession assertion stomping pass). Remove a couple unused debug settings and related code. 2023-05-17 13:40:33 -05:00
Maxim Nikolenko 0ee82f5264 SL-18641 fix for 'Always display friends in full detail' setting 2022-11-17 15:04:38 +02:00
Mnikolenko Productengine dcd74c98dc SL-18202 impostor too slow avatars and add autotune settings button to Preference 2022-09-27 19:35:49 +03:00
AndreyL ProductEngine af9069edbf Merged in lindenlab/viewer-release 2018-03-02 00:47:08 +02:00
ruslantproductengine cc30a9e2f5 MAINT-3178 [MAINTENANCE RC] Ribbon particles using textures containing alpha flash white at certain camera angles
FIXED. Based on: 6317cce88f (chg-indra)/newview/llvopartgroup.cpp
and http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/9ecea804a06d
2018-02-03 14:11:26 +02:00
andreykproductengine bd786ada4f MAINT-8279 Fix for crash on unset pcode 2018-02-09 14:19:31 +02:00
Mnikolenko Productengine 8bceb80902 MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object 2017-12-05 18:19:30 +02:00
Mnikolenko Productengine 17c22d317f MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object 2017-11-09 16:09:51 +02:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
ruslantproductengine 0ffc4f2667 MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered 2016-03-02 18:35:43 +02:00
Mnikolenko ProductEngine 2ede35f1b6 MAINT-5681 FIXED particles still render when complexity threshold is reached 2015-12-01 15:29:43 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
callum_linden 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
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 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
Dave Parks cacefaf2fc MAINT-2811 Fix for infinite loop on octree code during teleport. 2013-08-30 15:55:20 -05:00
Xiaohong Bao d8c02bf062 Merge 2013-08-19 16:09:28 -06:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon 5687b0c4df Merge 2013-05-09 15:30:49 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon 8895e79576 Merge downstream code / viewer-beta 2013-05-09 13:21:22 -07:00
Dave Parks dbfcd6c9c5 Optimization -- don't draw glow in alpha pool unless needed 2013-05-07 17:20:33 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Xiaohong Bao 7a33d88886 freeze particle system when monitor scene loading 2013-03-28 16:52:36 -06:00
Dave Parks 08ae21f52d MAINT-2410 Extra Particle Parameters -- viewer implementation
Reviewed by Kelly and Graham
2013-03-13 17:07:22 -05:00
simon@Simon-PC.lindenlab.com c72a0b7bbc MAINT-2158 - Particle grievance. Particles are not added at less than 4 fps.
Reviewed by Kelly
2013-01-22 13:51:19 -08:00
Xiaohong Bao c0ba626c80 For SH-3333: Design and implement a new object cache system on viewer side 2012-10-15 21:34:29 -06:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks 423659c680 MAINT-775 Particle vertex buffer management optimizations 2012-05-02 15:45:38 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 2fea1d5d33 Integrate SIMD API from oreh/server-trunk-oreh 2010-08-19 12:25:15 -05:00
Dave Parks 26ba00b555 Vectorized octree and much of llspatialpartition and lldrawable.
Octree driven raycast.
2010-06-03 12:52:28 -05:00
Tofu Linden 344eaeb39b CID-376
Checker: UNINIT_CTOR
Function: LLViewerPart::LLViewerPart()
File: /indra/newview/llviewerpartsim.cpp
2010-01-27 16:27:02 -08:00
James Cook 7d3b3cc474 Linker optimization - use "extern template" for commonly regenerated templates
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
Mark Palange 46f8fb8781 svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
2009-02-03 21:15:57 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Kelly Washington dc48f1c741 svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.

QAR-448
2008-04-03 22:50:22 +00:00