123f8e77cd
MAINT-4288 FIXED Backed out changeset for MAINT-4018 (c92d43623c2c)
2014-08-22 16:38:37 +03:00
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
770a0a2dea
MAINT-2980 Back out most changes related to upping the 512MB texture cap to unblock RC.
2014-07-07 10:28:54 -05:00
05319e6c94
Pull downstream viewer-tiger and become version 3.7.11
2014-06-24 10:06:28 -07:00
90ee53f5a1
MAINT-2980 Up texture memory slider cap to 4096MB. Make "Texture Memory" default to 1/3rd of video memory. Add description on debug setting and tooltip to explain why.
2014-06-23 23:10:23 -05:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
ca79d23893
MAINT-4018 FIXED Mini profile pictures tend to fail to load fully, and sometimes not at all.
...
Profile icons are no longer discarded uless they are too big. Icons will refresh correctly if needed.
2014-05-23 19:05:49 +03:00
d13b0a299e
MAINT-3950 FIXED can't open lag meter
...
brought back llfloaterlagmeter from the dead, and ported to lltrace
2014-05-20 14:07:23 -07:00
487ca1bad3
v-r -> s-e merge WIP
2014-05-14 17:50:59 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
5fc3066bdb
add some debug code for possible gray baked avatar textures
2013-11-07 15:36:45 -07:00
854aec1231
a try to fix the blurry texture problem.
2013-10-28 11:02:33 -06:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
2331b9a93b
merge
2013-10-15 11:18:00 -04:00
b486f6a72c
SH-4458 SH-3652 FIX Pants flare does not load properly upon an avatar returning
...
Viewer added a new callback when the avatar returned without resetting the
timer for last reference to the saved raw image. This created a time window
in which new callbacks could get cleared out due to the raw image getting destroyed.
Since the callback was removed, pants flare was not properly applied. Appears
to be working now.
2013-10-11 16:52:45 -04:00
f20fadeafa
fix a texture issue that unpaused callbacks never get fired.
2013-10-08 15:23:47 -06:00
c8122f6393
merge
2013-09-24 07:28:01 -04:00
259394b541
fix the bug that texture aux channel data can not be reloaded.
2013-09-23 17:03:19 -06:00
da398cb12f
SH-3455 WIP - post-SSA cleanup
2013-09-23 18:15:25 -04:00
36bb33b12a
sunshine cleanup annotations
2013-09-18 17:03:34 -04:00
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
a3b1a60ed7
merge
2013-08-22 16:12:40 -04:00
1616b73ef3
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
2013-08-19 16:12:07 -06:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
5ae117aff6
merge with viewer-release
2013-08-16 19:31:16 -04:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
26581404e4
BUILDFIX: added header for numeric_limits support on gcc
...
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
63cc379c72
MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found
2013-10-04 02:50:50 +03:00
006490032a
Fix for crash on exit with debug GL enabled.
2013-10-21 10:34:36 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
9fd3af3c38
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed Units macros and argument order to make it more clear
optimized units for integer types
fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13 15:29:15 -07:00
56cf4297f3
SH-4250 WIP - logging tweaks and cleanup
2013-06-13 16:07:02 -04:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
a74b5dfa92
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
fixed mem stat tracking...now properly tracks memory footprint with floating point
precision
cleaned up macros for unit declaration
renamed units to SI standard for 1024 multiples (kibibytes, etc)
fixed units output for scene monitor dump
2013-06-04 19:45:33 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
b130308d1c
Restore hysteresis in llviewertexture.cpp and side-step unused var (now used again)
2013-04-26 08:10:26 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
c978364e1e
for SH-4133: create a debug tool to show textures in active fetching
2013-04-22 22:11:41 -06:00
maksymsproductengine