0c60e32808
Merge
2013-10-21 16:57:38 -06:00
cecad67163
merge
2013-10-16 17:56:48 -04:00
1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
17df8988fe
renamed TraceType to StatType
...
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -07:00
754e8752a9
added initial memory usage tracking for lltrace
2013-10-03 14:30:34 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
badb8a945d
NORSPEC-259 revive fix stomped with materials->bear merge
2013-09-26 09:23:47 -07:00
71e986b059
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
2013-09-23 14:49:10 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
63757692b6
NORSPEC-362 Fix leak of deferred color attachments
2013-09-11 20:40:11 -07:00
e6a68e1f09
merge
2013-09-10 15:30:13 -04:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e8bd9afbe6
Merge viewer-release 3.6.5 Cocoa
2013-09-09 13:10:45 -07:00
e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07: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
a7aed07a5b
broke out llunit.h into llunittype.h and llunits.h for unit declarations
...
changed unit declarations macros to make a lot more sense
2013-08-27 13:41:19 -07:00
a3b1a60ed7
merge
2013-08-22 16:12:40 -04:00
8675ed0491
Fix merge regressions from missed changes to LoD updates
2013-08-19 16:04:28 -07: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
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
3f186aab77
Merge in viewer-release
2013-08-19 12:10:40 -07: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
80256fdbf5
NORSPEC-349 make render targets use original formats when resizing impostors and fix alpha for deferred impostor shader
2013-08-15 10:07:41 -07:00
dc63061714
NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking obey vertex alpha
2013-08-15 09:37:54 -07: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
93b3f1297e
MAINT-3338 fix disable of particle glow on false suspicion of lying network data
2013-10-21 13:20:34 -07:00
0ab4e11223
Fix for random bad colors in UI on Intel HD 4000
2013-10-08 14:43:10 -05:00
e43058e764
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
4709ca9697
NORSPEC-259 revive fix stomped with materials->bear merge
2013-09-26 09:23:47 -07: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
42ce98e8bf
NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow
2013-07-30 13:44:12 -07:00
f86a7c04d3
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
2013-07-30 11:33:58 -07:00
b44e7303d8
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
2013-07-29 18:59:45 -07:00
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
e290dd3fa1
NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects)
2013-07-24 04:03:27 -07:00
52f292c063
Merge
2013-07-23 23:07:16 -06:00
fa74313e7d
NORSPEC-314 WIP make work-around easier to flip and add 9800M as an evil mac
2013-07-23 04:52:59 -07:00
e40065f82c
BUILDFIX: #include and dependency cleanup
2013-07-19 15:03:05 -07:00
1587999b03
Add info to vert buffer warnings to track down fullbright alpha mask crasher
2013-07-16 12:03:42 -07:00
3a8ad62d9b
Merge with latest viewer-release.
2013-07-11 19:46:20 -04:00
d6d2f74fbb
NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup.
2013-07-01 16:27:20 -05:00
d262ca32d3
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-07-01 10:59:46 -05:00
bd41392b7e
Merge with viewer-bear which was just merged with viewer-release
2013-06-28 13:36:41 -07:00
7df863265f
NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and divides from various lighting functions.
2013-06-28 13:32:01 -05:00
b6b4b59138
Merge with viewer-release
2013-06-27 18:03:47 -07:00
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
c07f47dee8
NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sources
2013-06-24 19:28:02 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05: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
e71b415841
Merge
2013-06-19 12:59:56 -07:00
9c83d4b5b8
Merge with viewer-release.
2013-06-19 15:47:57 -04:00
45b1466de6
Review cleanup
2013-06-18 19:51:02 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
c603eb5ece
MAINT-318 prevent crashes from incomplete quads and lines and prevent drivers from crashing to desktop when passed short buffers
2013-06-17 08:03:32 -07: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
042b7aec26
BUILDFIX: fixed llviewerassetstats test and render2dutils changes
...
that were dropped in merge
2013-06-05 20:25:21 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
743d1a777e
NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
...
Reviewed by Graham
2013-05-29 18:48:09 -05:00
933d4c40f4
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
2013-05-23 12:47:52 -05:00
473474b949
Revert changes for MAINT-2616 due to licensing issues, need a full patch
...
submitted to be acceptable
2013-05-22 16:51:42 -07:00
a04a706c1b
merge
2013-05-21 16:18:48 -04:00
abdbf45aaa
MAINT-2616 : Updated my Intel driver and now have orange in buttons and
...
Inventory pull down bar causing blinks to screen. Pulled in FS code,
Reviewed by Kelly
2013-05-20 11:18:12 -07:00
f111b5b113
Fix EOL characters
2013-05-14 09:24:58 -07:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
b864cecd6c
De-bork the viewer merge, causing black in-world images. Reviewed by Kelly
2013-05-13 16:34:52 -07:00
a099815774
Merge vwr-dev-mat
2013-05-11 08:11:13 -07:00
f2455ccaaf
Put back normal map and spec map initializers/destruction, delete FMOD refs (unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10 16:10:25 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -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
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
6b81b8629e
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
2013-05-05 17:45:35 -07:00
fb73cf01af
NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect Mac too
2013-05-01 11:56:15 -07:00
d328bfd96e
NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect Mac too
2013-05-01 11:56:15 -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
03cfdeca7a
Fix ifdefs around asserts broken in release only by merge
2013-04-26 10:52:02 -07:00
1688e995eb
Provide LLGLSLShader backwards compat so as not to break the appearance utility
2013-04-26 09:11:52 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
d46c7039bc
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-04-24 12:41:14 -05:00
87ba85eaab
diff -r 59c7bed66dfd indra/llcommon/lleventapi.h
2013-04-24 09:35:38 -07:00
7931804321
NORSPEC-59 NORSPEC-125 make materials and alpha shaders work on Mac laptops with nV mobile graphics cards
2013-04-24 06:24:21 -07:00
fcec034a38
Tweak to remove usage of GL_DEPTH_CLAMP for now until projectors can be made to work with it.
2013-04-23 17:03:57 -05:00
c978364e1e
for SH-4133: create a debug tool to show textures in active fetching
2013-04-22 22:11:41 -06:00
b2344cfd13
Fix rendering artifacts on Mac Mobile GeForce cards
2013-04-20 03:36:21 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
e40bcc4e16
NORSPEC-59 and NORSPEC-133 work-around crash with RenderDebugGL on and fix breakage in shaders from Mac changes
2013-04-17 09:05:40 -07:00
b7d4ba1f08
merge changes for alpha fixes from geenz
2013-04-16 09:00:39 -04:00
c72c3691ec
Merged Graham's stuff amongst others.
2013-04-15 19:40:12 -04:00
f964e51fc9
Fix for mac build
2013-04-15 15:31:57 -05:00
8025b8b2bc
NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available
2013-04-15 13:16:14 -05:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
c7bab8ab8b
Merge
2013-04-11 16:04:21 -07:00
cfc3757778
First pass on alpha blended materials
2013-04-11 14:57:11 -04:00
893bcf34f7
NORSPEC-59 work around nV driver crash when doing deferred rendering on NV 9400M/9600M
2013-04-09 12:37:57 -07:00
679a095aa0
NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.
2013-04-02 15:45:17 -05:00
2fde4a9ae5
merge changes for 3.5.0-beta7
2013-04-01 14:24:01 -04:00
fc4869fb78
NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps.
2013-03-29 16:13:36 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
14ddfcdf52
Merged lindenlab/viewer-development into default
2013-03-28 19:16:48 -07:00
41ca92c67c
NORSPEC-54 Potential fix for crashing on all sorts of random operations.
2013-03-25 18:27:07 -05:00
a976f5c217
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
2013-03-25 12:19:02 -07:00
98a82c50d5
Pull in downstream CHUI code from viewer-development
2013-03-25 11:12:52 -07:00
1d8e3997c8
Pull and merge latest viewer-beta
2013-03-22 14:17:26 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
f345746161
Folded in changes from sunshine-stable
2013-03-21 11:21:45 -04:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
c294c7c474
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
2013-03-16 16:09:50 -07:00
9a7a19c77a
Merge
2013-03-13 17:13:45 -05:00
08ae21f52d
MAINT-2410 Extra Particle Parameters -- viewer implementation
...
Reviewed by Kelly and Graham
2013-03-13 17:07:22 -05:00
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
662d67e3b5
Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures
2013-03-13 08:46:59 +00:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
34fe6ad591
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
35383790fb
Merge pragma warning hack to fix linux build
2013-03-12 04:40:51 -07:00
e7a4cce356
CHUI-846 FIXED [crashhunters] crash in LLFontGL::maxDrawableChars
2013-03-12 00:41:35 +02:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
586025bde5
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-03-04 18:06:29 -06:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
4e81a84abd
Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively.
2013-03-04 08:57:58 -08:00
59a0c68780
Fix windoze line-endings from missing commit hook fiasco
2013-03-01 11:34:33 -08:00
dfda8826eb
Make WL updates use pre-hashed strings for uniform sets
2013-03-01 11:21:35 -08:00
93eaccae6f
Modify LLInstanceTracker to avoid using a map of strings to find a map of foo to find some pointers
2013-02-28 15:35:14 -08:00
df08808640
Improve perf of GLSL uniform lookups by name
2013-02-28 09:33:41 -08:00
f5e5396c3a
MAINT-2371 First set of profile guided optimizations.
...
Reviewed by Graham
2013-02-26 15:15:08 -06:00
98e02a5d76
Merge new boost and add OS X 10.8 mods
2013-02-22 09:49:58 -08:00
2fd0e6e8f9
Merge viewer-cat and resolve conflict with alternate self
2013-02-21 16:50:04 -08:00
f67087b872
MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider)
2013-02-20 19:30:46 -06:00
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
019c7566fb
For MAINT-1291 Code Review: DaveP
2013-02-07 09:18:09 -08:00
2ae4b6976b
Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state.
2013-02-04 11:32:05 -05:00
ee87ef2303
merge downstream code from viewer-lion
2013-01-30 15:25:09 -08:00
aa1befd689
Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry.
2013-01-30 12:17:04 -05:00
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05:00
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
eda11a25a4
Initial (largely complete) gamma correct rendering implementation.
2013-01-11 06:37:21 -05:00
e8f6734d67
Merge
2013-01-07 12:34:19 -05:00
cbf24c55d5
SH-3344 WIP - additional debugging output for avatar local textures
2012-12-20 10:27:18 -05:00
615af0c556
MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black borders
2012-12-18 16:39:48 -06:00
74d3dc41fb
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-12-11 17:04:23 -08:00
0302573348
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2012-12-11 16:38:10 -05:00
9e2e150064
Check to see if GL_EXT_texture_sRGB and GL_ARB_framebuffer_sRGB are available.
2012-12-07 11:07:41 -05:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
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
ea0461c012
Pull and merge https://bitbucket.org/lindenlab/viewer-development .
2012-11-21 15:07:17 -08:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
76990fab4f
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-13 17:17:41 -08:00
0bb0bd514b
SH-3499 WIP Ensure asset stats output is correct
...
Finished making LLUnit implicitly convertible to/from scalar integer values
cleaned up test code
2012-11-08 23:42:18 -08:00
e6ca5471a2
SH-3275 Update viewer metrics system to be more flexible
...
put template parameter back in LLUnit units
added free function operators for mathematical manipulation of unit values
converted texture memory tracking to units
2012-10-17 00:06:22 -07:00
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
cc5f8686fe
Speeding up cmake configuration, especially on linux. Re-arranged llrender/llwindow cmake source a bit
2012-10-15 17:36:51 +00:00
f974374789
Pulling in viewer-gcc4.6 freetype fixes
2012-10-13 01:39:41 +00:00
e941457a08
Fix for 'no text in release builds' problem
2012-10-12 15:05:56 -04:00
30aea02e8e
Fix for release build in gcc 4.6
2012-10-11 01:00:31 +00:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
9b05e5f35b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development-materials.
2012-10-09 12:32:45 -07:00
19e43e4b58
Added fast timers for baked texture rendering. Updated appearance utility
2012-10-06 08:08:52 +00:00
003020763b
Turning on mHasShaderObjects for mesa headless
2012-10-04 20:11:33 +00:00
21df924a10
Building headless and non-headless libraries side-by-side, removing the need for the BAKING cmake setting.
2012-10-04 06:29:07 +00:00
c9ab9590aa
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
2012-10-04 03:12:48 +00:00
8c0aa31536
Adding optimization to skip alpha image analysis when it isn't needed.
2012-10-04 00:42:31 +00:00
b1baf982b1
SH-3275 WIP Run viewer metrics for object update messages
...
factored out lltrace::sampler into separate file
added rudimentary lltrace support to llstatgraph
made llstatgraph use param blocks more effectively
moves initial set of stats over to lltrace
removed windows.h #defines for min and max
2012-09-30 10:41:29 -07:00
3d698286fb
Wrapping failing llgl assert in gDebugGL
2012-09-25 23:27:15 +00:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
2d36f9b98a
Fix for missing symbols on windows builds
2012-09-22 03:39:32 +00:00
c6a2ac0489
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20 19:43:54 -07:00
8edf8b002d
BUILDFIX: not including headless libraries if we haven't defined llrenderheadless
2012-09-20 17:49:48 +00:00
683c43c2e0
reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.
2012-09-20 10:00:55 -04:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
9307810e7e
Fix for merge build error. Attempt to cleanup cmake warnings regarding incorrect target_link_libraries
2012-09-13 22:53:16 +00:00
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
cf7eb79fa7
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-08 04:39:11 +00:00
371b66a6ef
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-09-06 11:47:48 -07:00
852e608599
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-14 14:37:38 -05:00
55a812ca77
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-06 16:37:51 -05:00
3653727e7f
Introduce new LLDir::findSkinnedFilenames() method. Use as needed.
...
In a number of different places, for different reasons, the viewer wants to
load a UI-related file that might be overridden by a non-default skin; and
within that skin, might further be overridden by a non-default language.
Apparently, for each of those use cases, every individual developer approached
it as an entirely new problem, solving it idiosyncratically for that one case.
Not only is this a maintenance problem, but it rubs one's nose in the fact
that most such solutions consider only a subset of the relevant skin
directories.
Richard and I evolved an API intended to address all such cases: a central
LLDir method returning a list of relevant pathnames, from most general to most
localized, filtered to present only existing files; plus a couple of
convenience methods to specifically obtain the most general and most localized
available file.
There were several load-skinned-file methods (LLFloater::buildFromFile(),
LLPanel::buildFromFile() and LLUICtrlFactory::createFromFile() -- apparently
cloned-and-modified from each other) that contained funky bolted-on logic to
output the loaded data to an optional passed LLXMLNodePtr param. The trouble
is that passing that param forced each of these methods to subvert its normal
search: specifically for that case, it needed to find the baseline XML file
instead of the localized one. Richard agreed that for the intended usage
(reformatting XML files) we should use XML schema instead, and that the hacky
functionality should be removed. Remove it. Also remove
LLUICtrlFactory::getLocalizedXMLNode(), only used for those three special cases.
Some callers explicitly passed the optional LLXMLNodePtr param as NULL. Remove
that.
Remove LLFloaterUIPreview::displayFloater(save) param, which relied on the
optional output LLXMLNodePtr param. Make onClickSaveFloater() and
onClickSaveAll() emit popupAndPrintWarning() about discontinued functionality.
Recast LLFloater::buildFromFile(), LLPanel::buildFromFile(),
LLUICtrlFactory::createFromFile(), LLNotifications::loadTemplates(),
LLUI::locateSkin(), LLFontRegistry::parseFontInfo(),
LLUIColorTable::loadFromSettings(), LLUICtrlFactory::loadWidgetTemplate(),
LLUICtrlFactory::getLayeredXMLNode(), LLUIImageList::initFromFile(),
LLAppViewer::launchUpdater() and LLMediaCtrl::navigateToLocalPage() to use
findSkinnedFilenames(). (Is LLAppViewer::launchUpdater() ever called any more?
Apparently so -- though the linux-updater.bin logic to process the relevant
command-line switch has been disabled. Shrug.) (Is
LLMediaCtrl::navigateToLocalPage() ever used?? If so, why?)
Remove LLUI::setupPaths(), getXUIPaths(), getSkinPath() and
getLocalizedSkinPath(). Remove the skins/paths.xml file read by setupPaths().
The only configuration it contained was the pair of partial paths "xui/en" and
"xui/[LANGUAGE]" -- hardly likely to change. getSkinPath() specifically
returned the first of these, while getLocalizedSkinPath() specifically
returned the second. This knowledge is now embedded in findSkinnedFilenames().
Also remove paths.xml from viewer_manifest.py.
Remove injected xui_paths from LLFontGL::initClass() and
LLFontRegistry::LLFontRegistry(). These are no longer needed since
LLFontRegistry can now directly consult LLDir for its path search. Stop
passing LLUI::getXUIPaths() to LLFontGL::initClass() in LLViewerWindow's
constructor and initFonts() method.
Add LLDir::append() and add() methods for the simple task of combining two
path components separated by getDirDelimiter() -- but only if they're both
non-empty. Amazing how often that logic is replicated. Replace some existing
concatenations with add() or append().
New LLDir::findSkinnedFilenames() method must know current language. Allow
injecting current language by adding an LLDir::setSkinFolder(language) param,
and pass it where LLAppViewer::init() and initConfiguration() currently call
setSkinFolder(). Also add LLDir::getSkinFolder() and getLanguage() methods.
Change LLFLoaterUIPreview's LLLocalizationResetForcer helper to "forcibly
reset language" using LLDir::setSkinFolder() instead of LLUI::setupPaths().
Update LLDir stubs in lldir_stub.cpp and llupdaterservice_test.cpp.
Add LLDir::getUserDefaultSkinDir() to obtain often-overlooked possible skin
directory -- like getUserSkinDir() but with "default" in place of the current
skin name as the last path component. (However, we hope findSkinnedFilenames()
obviates most explicit use of such individual skin directory pathnames.)
Add LLDir unit tests for new findSkinnedFilenames() and add() methods -- the
latter exercises append() as well.
Tweak indra/integration_tests/llui_libtest/llui_libtest.cpp for all the above.
Notably, comment out its export_test_floaters() function, since the essential
LLFloater::buildFromFile(optional LLXMLNodePtr) functionality has been
removed. This may mean that llui_libtest.cpp has little remaining value, not
sure.
2012-10-10 14:57:43 -04:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
41301004e1
Cleanup actions from code review of llappearance with nyx
2012-09-04 22:49:26 +00:00
0f519ca167
Set virtual inheritance on LLTexture -> LLRefCount
2012-09-04 17:47:16 +00:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00
Xiaohong Bao