Brad Linden
|
68f712615f
|
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
|
2024-08-20 09:44:14 -07:00 |
|
Brad Linden
|
5f26ba8014
|
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
# Conflicts:
# indra/newview/llpanelpeople.cpp
|
2024-08-15 09:41:54 -07:00 |
|
Alexander Gavriliuk
|
06846d78b5
|
#2263 BugSplat Crash #1503400: SecondLifeViewer!LLDrawable::getFace(320)
|
2024-08-12 22:51:12 +02: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 |
|
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 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +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
|
c827d32ebe
|
SL-19655 Decruft legacy GLSL shaders and now unused build queues.
|
2023-05-17 18:09:36 -05: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 |
|
RunitaiLinden
|
7bd9d21e19
|
Optimizations, decruft, and intel compatibility pass (#53)
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
|
2023-01-19 09:13:45 -06:00 |
|
Andrey Lihatskiy
|
a426e8ddb3
|
DRTVWR-543 post-merge cleanup
|
2022-05-27 19:05:14 +03:00 |
|
Andrey Lihatskiy
|
3da7a50b71
|
Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
|
2022-05-27 02:51:33 +03: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 |
|
Andrey Lihatskiy
|
201f83472c
|
Merge branch 'master' into DRTVWR-543-maint
|
2022-02-28 21:55:28 +02:00 |
|
Dave Parks
|
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 |
|
Andrey Kleshchev
|
4a4838aa83
|
SL-14988 Removed redundant check
Potentially a result of a merge conflict, same check and recorder are inside doFlexibleUpdate();
|
2021-08-16 22:33:27 +03:00 |
|
Andrey Kleshchev
|
c29a902e73
|
SL-14988 Overflow can keep flexi from updating
|
2021-08-16 22:11:52 +03:00 |
|
Andrey Kleshchev
|
4bab66a4b8
|
SL-15100 Crash rebulding faces #2
All preRebuild crashes appear to be LLVolumeImplFlexible
|
2021-04-09 23:31:51 +03:00 |
|
andreykproductengine
|
6bc2c5789c
|
MAINT-6931 Fixed Flexi prims being FPS dependent
|
2017-07-07 20:01:06 +03: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 |
|
Xiaohong Bao
|
a847caade4
|
more fix for a non-finite number assertion in llvolume
|
2014-02-05 16:16:30 -07:00 |
|
Xiaohong Bao
|
555cf227ff
|
trivial: fix several weird compiling errors.
|
2013-10-25 10:29:45 -06: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 |
|
simon
|
ee2fce8790
|
Merge downstream code and viewer-beta
|
2013-05-09 14:10:45 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
simon
|
6742d90d39
|
Some minor cleanups while hunting crashes. Reviewed by Kelly
|
2013-04-17 11:17:46 -07:00 |
|
simon
|
b42b789723
|
Merge in downstream code (chui fixes, materials)
|
2013-04-11 16:18:34 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Simon Linden
|
d5561a1ada
|
Merge in viewer-beta to get CHUI code
|
2013-03-19 16:20:53 -07:00 |
|
prep
|
207d9fd767
|
Viewer-chui merge
|
2013-03-11 14:45:53 -04:00 |
|
Dave Parks
|
f8e059deee
|
MAINT-2371 Lat round of optimizations.
Reviewed by Graham
|
2013-03-08 17:11:30 -06:00 |
|
Merov Linden
|
faae38daaa
|
Pull merge from lindenlab/viewer-developement
|
2013-01-30 20:01:03 -08:00 |
|
Nyx Linden
|
11fe124ae9
|
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
|
2013-01-24 16:22:49 -05:00 |
|
Merov Linden
|
573ab07a40
|
Merge pull from lindenlab/viewer-beta
|
2013-01-10 14:51:59 -08:00 |
|
William Todd Stinson
|
138d4f5fcd
|
Updating a comment.
|
2012-12-17 16:15:28 -08:00 |
|
simon@Simon-PC.lindenlab.com
|
40e78a80cc
|
Pull and merge viewer-development
|
2012-12-04 14:31:15 -08:00 |
|
prep
|
e0432f98ee
|
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
|
2012-11-28 16:36:34 -05:00 |
|
Dave Parks
|
5d34ac552f
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development
|
2012-11-20 17:03:55 -06:00 |
|
Dave Parks
|
18e20ca6f2
|
MAINT-1270 Fix for flexi prims showing up as discs when first loading.
Reviewed by Stinson.
|
2012-11-20 16:50:23 -06:00 |
|
Dave Parks
|
8db983fb80
|
MAINT-1270 Fix for flexi prims showing up as discs when first loading.
Reviewed by Stinson.
|
2012-11-20 16:50:23 -06:00 |
|
William Todd Stinson
|
6036ee9c42
|
MAINT-1890 FIX Removing previous hacky fix for this issue. The better solution is to clamp the update_period to a reasonable number of frames (32).
|
2012-11-16 17:26:01 -08:00 |
|
William Todd Stinson
|
ad84656016
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-11-14 11:20:29 -08:00 |
|
William Todd Stinson
|
951b4c3efb
|
MAINT-1890: Adding a more descriptive comment to this hack fix for future reference.
|
2012-11-13 15:23:15 -08:00 |
|
William Todd Stinson
|
c137b645b6
|
MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate.
|
2012-11-12 19:35:34 -08:00 |