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 |
William Todd Stinson
|
93995ada05
|
MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() method. The callstacks indicated that the std library was throwing a length exception on the std::vector::resize() call. Most likely cause was that the recent changes for flexi-prims were causing the mRenderRes to become negative. And thus, the 1<<mRenderRes calculation was generating a really large value for num_render_sections.
|
2012-11-12 15:27:56 -08:00 |
Don Kjer
|
c06c35609c
|
Updating linux build to gcc4.6
|
2012-10-11 00:09:04 +00:00 |
MaksymS ProductEngine
|
d1481a599f
|
MAINT-1486 FIXED Crash on login (Unhandled exception)
|
2012-08-31 00:38:16 +03:00 |
Todd Stinson
|
6d84272d38
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-08-23 15:11:10 -07:00 |
Oz Linden
|
1e0470ac56
|
correct merge error
|
2012-08-14 12:41:48 -04:00 |
Oz Linden
|
24c1b62e27
|
merge back beta fixes
|
2012-08-14 09:01:56 -04:00 |
simon@Simon-PC.lindenlab.com
|
92a0db2a4f
|
Merge MAINT-1270 fix
|
2012-08-01 13:17:35 -07:00 |
Dave Parks
|
e3c5cf99f1
|
MAINT-1270 Fix for some flexi prims becoming flat at some LoDs
|
2012-07-16 17:27:52 -05:00 |
Dave Parks
|
407d227e25
|
MAINT-1270 Fix for some flexi prims becoming flat at some LoDs
|
2012-07-16 17:27:52 -05:00 |
Dave Parks
|
7929db82d1
|
MAINT-794 Move flexi idleUpdate and texture animation to their own update queues.
|
2012-06-20 18:29:18 -05:00 |