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
204be2ba52
Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific LLViewerTexLayerSetBuffer
2012-09-04 15:18:15 +00:00
403d1b6404
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
2012-09-03 20:12:47 +00:00
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00
d5b45b0b63
Use an unordered map for custom #defines instead of a map. Lookups are faster, and we don't really care about any particular order anyways for these.
2012-08-29 08:02:46 -04:00
e606677ed8
Added the ability to remove a preprocessor define.
2012-08-29 04:56:54 -04:00
c911efb953
Just pass in an empty preprocessor definition map from now on. The shader compiler won't add new #defines if it's empty.
2012-08-29 03:41:26 -04:00
99371f892e
Added new bindTexture and unbindTexture API to LLGLSLShader. Reviewed by davep.
2012-08-28 14:44:28 -04:00
ed1b78e322
Added support for adding custom preprocessor definitions (for shader permutations)
2012-08-28 10:33:32 -04:00
efdcf045b0
Merged in from viewer-development.
2012-08-17 08:07:15 -07:00
97106c2dea
merge changes for DRTVWR-194
2012-08-15 17:07:10 -04:00
5ee461ab19
merge
2012-08-08 15:52:54 -07:00
83f5d0c616
Merge in viewer-development
2012-07-31 15:42:02 -07:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
a1d0268893
Minor improvement to identifying gl lib to use. Should use xcode version.
2012-07-24 16:52:33 -07:00
8df3619621
merge to viewer-developmento
2012-07-24 10:51:37 -04:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
afcc61a07a
fix for SH-3238: Textures are loaded at lower detail on subsequent log-ins
2012-07-19 15:31:33 -06:00
35eda06ae4
llglheader include change for building on Lion
2012-07-18 17:35:10 -07:00
cb96ab1a6f
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
2012-07-18 15:49:47 -05:00
509408f393
merge back beta fixes for DRTVWR-180
2012-07-14 09:30:09 -04:00
56d563ba7f
Fix merge issues - duplicate insertions of code
2012-07-11 17:14:25 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
e86b1c18db
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
997b360747
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
cfc5236e64
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
2012-07-18 15:49:47 -05:00
d1c056beba
MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly.
2012-07-03 14:35:08 -05:00
bedbbf7c02
Merge
2012-06-28 16:32:54 -05:00
ed72fd0ae9
merge
2012-06-28 13:22:04 -05:00
fa562d19cf
Removing unreferenced methods from the LLRenderNavPrim class.
2012-06-27 18:12:57 -07:00
78910cf301
Updating the header licensing comments.
2012-06-26 18:04:19 -07:00
74d4f8af01
v-r to drano merge conflicts wip
2012-06-26 16:43:58 -04:00
6e710333e7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-06-22 18:59:31 -07:00
28ccf4190e
MAINT-653 Fix for shadow acne at high altitudes
2012-06-22 17:31:46 -05:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
2eedd0c3c0
Merge with tip
2012-06-15 13:00:49 -07:00
b93a23aa82
MAINT-1147 Fix for frame stall on region crossing.
2012-06-13 18:05:56 -05:00
6ee0456220
merge
2012-06-04 15:28:08 -04:00
0fd3ff972d
MAINT-1142 use VBO pooling on OSX
2012-06-04 12:15:08 -07:00
e0b334c615
Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes.
2012-07-21 14:18:10 +02:00
86e84ae75e
Crashfix; handle errors in release builds more gracefully.
2012-09-01 15:24:54 +02:00
bc34217979
Add virtual destructor to LLGLFence.
2012-09-26 20:02:32 +02:00
67221663fe
MAINT-616 Fix for mac build.
2012-05-30 14:55:34 -05:00
2e26dc3971
Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting.
2012-05-30 13:22:04 -05:00
e3a5125b41
MAINT-616 Potential fix for corrupted mip maps.
2012-05-25 17:58:12 -05:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
abaf0155b4
MAINT-616 Faster issuance of occlusion queries.
2012-05-25 10:51:38 -05:00
efda0814cb
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
2012-05-24 10:50:48 -05:00
78df56e1b5
MAINT-616 Fix for crash on teleport from previous changes
2012-05-22 13:49:52 -05:00
7637acf76e
merge changes for DRTVWR-149
2012-05-22 06:03:42 -04:00
534168c452
MAINT-616 Fix for crash on shutdown caused by previous changes.
2012-05-22 00:49:07 -05:00
b7cfd8c7f0
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
2012-05-21 23:33:25 -05:00
1300f77fdd
Merged with viewer-beta
2012-05-20 17:41:00 +02:00
89b0b6ac71
MAINT-616 Different VBO Pooling scheme -- populate VBO pool with buffers that are likely to be requested, but never reuse a previously used buffer.
2012-05-15 16:42:04 -05:00
34e7226ac8
STORM-276 FIXED Squiggles overflow line editor height when font size is set to large
...
- Also reduced squiggle width from 6 to 4 and prevented running past the end of a word
2012-05-15 13:13:44 +02:00
c946408519
MAINT-586 Starting logging OpenGL version and shader level to simulator
2012-05-11 14:42:29 -05:00
678864e4ed
merge viewer-release to drano
2012-05-02 13:00:59 -04:00
da29210ed6
fix a sculpt crash
2012-05-01 21:29:19 -06:00
164de6c180
fix for a crash on sculpt
2012-04-27 18:32:42 -06:00
78f2663c4a
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:04:55 -04:00
9ce481a5ac
STORM-1819: Ternary/graded shadow support
...
Coalesced patchset.
2012-04-21 17:35:50 +01:00
31543e637b
Fixed default character width bug. Updated rendertri api for new path rendering bookends.
2012-04-10 14:34:28 -04:00
3d9374d1fd
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-pf-xray.
2012-04-05 12:16:42 -07:00
fef78653cd
consolidate navmesh rendering calls
2012-04-05 14:27:05 -04:00
b752a3a689
Navmesh edges are now rendered via vertex buffers. Enjoy the speedup!
2012-04-05 11:08:31 -04:00
68a4e0ee99
Fix build. Axe deprecated glNormal call. Don't show the world just because navmesh isn't checked.
2012-04-03 16:12:33 -05:00
36a0a58487
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
2012-04-03 11:06:33 -07:00
2388de3f95
Added normal support to navmesh tri renderer.
2012-04-03 13:06:21 -04:00
fa6add3fcd
merge changes for drtvwr-132
2012-04-03 11:28:56 -04:00
a244cff781
MAINT-778, MAINT-793 Fix for crash when enabling Debug GL on Mobile Intel 4 Express. Don't pop up driver update notification if GPU class is < 1
2012-03-30 12:17:34 -05:00
76634dc7af
MAINT-793 Pop up notification when drivers are likely out of date. Allow Lighting and Shadows on Intel when drivers are up to date.
2012-03-28 00:49:42 -05:00
b73f0f103d
Navmesh rendering api update to ll color structs
2012-03-27 15:33:04 -04:00
ce0f455b7c
MAINT-806 Fix for some shaders failing to link on ATI x800.
2012-03-26 13:09:09 -05:00
89d20b750c
Removed dead code
2012-03-22 15:56:00 -04:00
0af7b7038f
MAINT-804, MAINT-810 Disable framebuffer object usage on intel chips (implicitly disables lighting and shadows)
2012-03-21 16:05:57 -05:00
e94a38f0c9
merge
2012-03-21 09:53:59 -04:00
154e569923
Path-282: Added support for viewing the walkability map for various character types
2012-03-21 09:53:32 -04:00
2f4ad07633
Cleaning up miscellaneous differences between the pathfinding repository and the latest viewer-development.
2012-03-20 17:38:58 -07:00
3894701180
MAINT-708 Fix for pink when enabling RenderUseVAO
2012-03-14 16:13:23 -05:00
72f6df493c
Updated header for flush.
2012-03-14 16:22:19 -04:00
3953477ee5
MAINT-708 Reduce amount of video memory consumed by vertex buffer objects.
2012-03-13 17:34:11 -05:00
fab57eea61
pull and merge from viewer-development
2012-03-13 15:48:24 -04:00
633bd44b4a
merge changes for vmrg-225
2012-03-09 12:58:50 -05:00
83e69659e2
MAINT-708 Add checkbox to hardware settings for controlling texture compression. Default texture compression to on for cards with 512MB of VRAM or less, off otherwise.
2012-03-08 15:22:56 -06:00
cd468364a7
MAINT-708 Don't compress UI textures. Use GL_NICEST as compression hint to avoid artifacts.
2012-03-07 17:26:43 -06:00
41e095deb8
Path-287: VB bug fixes. Cleaned up rendering prims. Navmesh shape rendering fixes. Code cleanup
2012-03-07 17:48:17 -05:00
790554b218
Fix for overlaying navmesh on renderable geometry.
2012-03-07 11:19:13 -05:00
34a0a98f9d
Partial fix for Path-387. Path-287 Viewer perfomance tweaks.
2012-03-07 10:34:49 -05:00
f53fa08c70
MAINT-708 Use texture compression to minimize memory bloat (experimental)
2012-03-02 13:35:10 -06:00
7b3f721e7a
SH-3018 WIP - removed audit texture, other unused diagnostic code
2012-02-29 16:15:02 -05:00
353907bac6
SH-2908 Fix for incompatibility issue with GLSL 1.30
2012-02-28 16:10:04 -06:00
b64773bf2d
Fix for nacmesh viewing on low gfx setting and llpathinglib update.
2012-02-24 14:34:53 -05:00
b7d93d8adf
Path-267: Add support for rendering of walkable objects, obstacles and material phantoms.
2012-02-24 13:16:35 -05:00
a128836ded
SH-2908 Fix for linux build.
2012-02-23 13:41:19 -06:00
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
1de63bec50
MAINT-861 Fix for crash on exit due to bad matrix mode
2012-04-13 15:47:44 -05:00
3efa013ee4
MAINT-939 Potential fix for crash when editing objects.
2012-04-13 11:55:44 -05:00
484994b43b
MAINT-870 Fix for crash from out of control lawns.
2012-04-11 12:20:03 -05:00
8f261582b8
SH-2908 Fix for crash when enabling Lighting and Shadows on some AMD GPUs
2012-02-22 14:30:24 -06:00
e1a71a97cd
SH-2908 Potential fix for pink textures on some OpenGL 3.1 implementations.
2012-02-21 14:02:09 -06:00
8d12038ef6
SH-2908 Potential fix for precision complaints from some AMD OpenGL 3.1 implementations.
2012-02-17 15:06:48 -06:00
c618c0d621
Path-266: Navmesh is backfaced culled
2012-02-15 16:31:11 -05:00
3267b42ee5
SH-2908 Temporary fix for mac build
2012-02-13 18:26:48 -06:00
64c89ee2c5
SH-2908 Fix for mac build
2012-02-13 15:41:21 -06:00
80505ddf68
SH-2908 Fix for linux build.
2012-02-13 15:02:07 -06:00
76a27f5100
SH-2964 Fix for shader compilation error on some older NVIDIA cards.
2012-02-13 13:55:51 -06:00
6d6c38f216
Path-197. Navmeshes are converted into vbos.
2012-02-13 10:10:57 -05:00
3710c6110d
SH-2908 Rework indexed texture rendering to use a uvec4 instead of a float for texture indices in the data stream. Also rework gl_FragColor overrides to not collide with some odd driver implementations.
2012-02-10 20:04:19 -06:00
bbdb390624
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
2012-02-08 19:55:28 -08:00
e0582d4bc7
Fix for Debug GL generating errors when changing graphics preferences (reloading shaders).
2012-02-08 19:01:08 -06:00
d56be1f175
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
38e0b7de96
SH-2729 Fix for horizontal line of glitching graphics when DoF enabled
2012-02-06 18:56:19 -06:00
2ed1de224a
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-06 15:28:45 -08:00
ae7d475aeb
SH-2794, resolved merge conflict and corrected logic in LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06 12:43:23 -08:00
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
a61bb4eb21
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
2012-02-06 11:00:08 -08:00
e854db0645
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
...
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-03 19:04:36 -08:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
34408bed26
merge
2012-02-01 15:43:11 -05:00
c47c31fdbf
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-31 17:51:43 -08:00
12a045f199
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
2012-01-30 17:24:49 -08:00
22a6170a7b
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-27 19:55:16 -08:00
bbc265a9d5
EXP-1846 FIX Text positioning issues in Floaters, Notifications, UI, and toasts with UI size smaller than 1
...
also, re-enabled floater_test_textbox.xml
2012-01-26 16:30:38 -08:00
17b21fc197
Fix for windows build
2012-01-26 12:50:24 -06:00
71a660e006
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
...
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
2012-01-26 10:17:41 -08:00
0bbe8d73cb
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
2012-01-25 15:37:36 -06:00
e02f007d20
SH-1427 Fix for spot lights not working properly on alpha objects, and fix for alpha lighting of point lights not matching deferred lights.
2012-01-24 12:59:18 -06:00
655505d304
SH-2794 Fix for bad textures on some hardware when vbo mapping disabled (always use GL_STREAM_DRAW as the usage hint when mapping is disabled as geometry will be uploaded again and again)
2012-01-19 14:57:07 -06:00
dc6b871db8
merge
2012-01-19 14:39:06 -05:00
e2ef5a5edc
Path-196 : vbo cleanup, visual fixes (path-222)
2012-01-19 14:38:16 -05:00
3a597af700
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
...
fixed font metrics rounding error and made corrective adjustments in layout
2012-01-18 16:30:53 -08:00
80299bcd50
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-18 15:27:36 -07:00
05cff1ad7f
fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-18 15:26:30 -07:00
122691b836
merge
2012-01-18 12:41:40 -06:00
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
8cf6b9cb92
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-01-17 10:19:27 -08:00
837e38d819
trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-05 21:26:35 -07:00
b2c024cd79
Some gl state cleanup for physic shapes vbos.'
2012-01-05 18:00:41 -05:00
1e45d1ae4c
vbos for physics shapes are rendering correctly
2012-01-05 17:43:36 -05:00
e31a0a7f08
Remove already enabled depth test
2012-01-05 17:10:13 -05:00
22b877e70a
WIP: Navmesh vbos rendering fixes (added normal and color maps).
2012-01-05 17:02:22 -05:00
e2fd0266ca
path-149 overlay of navmesh on onto renderables
2012-01-05 10:20:18 -05:00
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
3fd7752f12
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-01-03 10:38:06 -08:00
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
e9058099d0
Allow for the overlaying of an unblended navmesh ontop of the scenes normal renderables
2011-12-20 12:57:32 -05:00
a94a923240
storm-1723: fix character display when a lot of different characters are used
2011-12-15 15:19:50 -05:00
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
35b6450d10
Enabled fix function when in navmesh rendering mode
2011-12-14 15:38:15 -05:00
28b298c4c7
Pull and merge from ssh://hg@bitbucket.org/prep/viewer-development-havokai.
2011-12-14 11:34:20 -08:00
6c9b332867
Make shapes a little bit transparent
2011-12-14 11:59:36 -05:00
10599b5e8c
merge
2011-12-14 11:25:30 -05:00
9fd7475e5c
merge
2011-12-14 11:19:20 -05:00
b022048f87
Cleanup
2011-12-14 11:13:55 -05:00
6fd6815dac
WIP: VBO fixes - still an issue where the physics shape inherit the navmehs color.
2011-12-13 18:13:23 -05:00
2dc7df91ad
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-13 15:23:55 -06:00
9d1db4f19a
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2011-12-13 11:15:18 -08:00
df6b11f098
comparing with ssh://hg@bitbucket.org/prep/viewer-development-havokai
...
searching for changes
changeset: 21247:08315c2b1a89
user: Todd Stinson <stinson@lindenlab.com>
date: Wed Dec 07 12:21:58 2011 -0800
summary: Adding additional source files to the project builds.
2011-12-12 09:51:04 -08:00
e907a2fba4
merge
2011-12-12 10:45:56 -05:00
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
4c60c59610
added vbo support for physics shapes & fixed navmesh/shape menu toggle
2011-12-09 15:56:12 -05:00
a5e2dad53d
Turning on navmesh rendering toggles normal renderables
2011-12-07 18:09:16 -05:00
8974278746
Turning on navmesh rendering toggles normal renderables
2011-12-07 17:56:02 -05:00
f9f247c5a6
SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase.
2011-12-07 16:36:26 -06:00
0b99da8ba5
WIP: Implementing VB manager for complex physics shapes
2011-12-05 17:20:54 -05:00
0539b08370
Renamed segment rendering class into RenderNavPrim
2011-12-01 11:38:16 -05:00
0538dcf62e
New navmesh viewer options, rendering improvements, etc.
2011-12-01 10:54:21 -05:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
ff32ef773b
fix for crash on startup (font system not initialized when first creating fonts)
2011-11-29 23:53:28 -08:00
45d3e147ac
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
2011-11-29 17:13:11 -06:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
06a2d4eb27
SH-2038 PROGRESS -- Hacked the code to not render alpha using VBO's on OS X since everything renders faster using VBO's except alpha for some mysterious reason.
2011-11-28 17:13:42 -08:00
5c690db63f
SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
2011-11-18 15:04:26 -06:00
38b7f033b2
navmeshdata is now parsed as binary
2011-11-17 17:33:49 -05:00
378c076d1d
WIP: navmesh station posts to a url, responder receives llsd and then has the llpathing library extract and render the navmesh (if desired).
2011-11-17 13:32:04 -05:00
b2824aa21d
SH-2690 Add comments per Vir's review feedback
2011-11-16 15:25:09 -06:00
986dccbeaf
SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments.
2011-11-16 15:08:17 -06:00
38853ffdda
merge
2011-11-16 12:41:15 -06:00
dbef1616dc
SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious Ringtail avatar)
2011-11-16 12:40:51 -06:00
6343c769ce
SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported
2011-11-16 10:00:41 -08:00
bbac7e9aec
SH-2681 Fix for shader compiler error on GLSL 1.30 and later
2011-11-15 13:01:23 -06:00
73d70b5d45
SH-2240 Make alpha mask cutoff a little less aggressive (err on the side of not creating an alpha mask)
2011-11-15 12:19:05 -06:00
df546bfba9
SH-2666 Tweak depth of field optimizations based on resident feedback.
2011-11-10 16:12:50 -06:00
c8f558f677
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
2011-11-10 11:39:08 -06:00
367d6212ae
SH-2652 Better DoF combine foo
2011-11-04 17:07:40 -05:00
e82c0561fa
SH-2652 Faster depth of field
2011-11-04 16:14:43 -05:00
fa5a0a90f4
SH-2240 Fix for core profile assertions when Debug GL enabled.
2011-11-03 15:00:40 -05:00
2179e1c1f2
SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-11-02 13:13:38 -05:00
b58229a64e
SH-1427 Fix for sunlight color getting clobbered for non-deferred atmospheric shaders.
2011-11-01 14:33:20 -05:00
969aa248a4
SH-2633 Fix for avatar hair turning white when editing appearance
2011-10-28 16:26:20 -05:00
da1898d1cb
SH-2625 Fix for window size reverting to non-maximized whenever shaders are loaded.
2011-10-26 11:19:04 -05:00
7dafa1be79
SH-2622 Put back "Basic Shaders" toggle ability.
2011-10-25 15:07:57 -05:00
973e99622e
SH-2240 Make OSX never attempt to use GLSL 1.30 or later
2011-10-21 11:05:49 -05:00
4ec72ed0a6
Fix for VBO pools not getting cleared appropriately.
2011-10-19 16:19:00 -05:00
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
6c157557dc
SH-2510 Potential fix for crash on startup on systems that don't have GL_ARB_shader_objects
2011-10-12 10:51:10 -05:00
2322c57b4d
SH-2545 Fix for transparent water option doing nothing when shaders are enabled.
2011-10-11 14:55:33 -05:00
Oz Linden