summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
AgeCommit message (Collapse)Author
2013-05-09Merge downstream code and viewer-betasimon
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11delay removing pre-fetched textures in case the login process is very long.Xiaohong Bao
2013-04-11First pass on alpha blended materialsGeenz
2013-04-11SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
removed MeanValueType<T>
2013-04-10SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
removed PeriodicRecording::getTotalRecording as it was showing up at the top on the profiler renamed getPrevRecordingPeriod, etc. to getPrevRecording
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-22MAINT-2518 : Viewer LLViewerTextureList::removeImageFromList() shouldn't crashsimon
Reviewed by Kelly.
2013-03-22merge with viewer-releaseRichard Linden
2013-03-11mergeprep
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-06renamed LLTrace stat gathering classes/methods to make the structure of ↵Richard Linden
LLTrace clearer Count becomes CountStatHandle Count.sum becomes sum(Count, value), etc.
2013-02-27Fix max VRAM detection on some cards and issues with sequencing of ↵Graham Madarasz (Graham Linden)
application of mem multiplier
2013-02-27For MAINT-2003 Fix sequencing issue causing mem multiplier to be applied ↵Graham Madarasz (Graham Linden)
after clamping below actual mem available
2013-02-14tweaked and added some log messages, including more detail when an image is ↵Brad Payne (Vir Linden)
flagged as missing
2013-02-09SH-3275 FIX interesting Update viewer metrics system to be more flexibleRichard Linden
moved image timings under "Update Images" fast timer
2013-02-01SH-3800 WIP - reject appearance messages with contradictory appearance ↵Brad Payne (Vir Linden)
version info
2013-01-30SH-3800 WIP - flag mismatched expectations for baked texture originsBrad Payne (Vir Linden)
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-19merge with viewer-developmentRichard Linden
2012-10-24SH-3430 FIX - don't cache ids of images with specified URLs, such as server ↵Brad Payne (Vir Linden)
bakes
2012-10-17SH-3405 WIP convert existing stats to lltrace systemRichard Linden
started conversion of llviewerassetstats removed old, dead LLViewerStats code made units tracing require units declaration clean up of units handling
2012-10-17SH-3275 Update viewer metrics system to be more flexibleRichard Linden
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-15SH-3405 WIP convert existing stats to lltrace systemRichard Linden
converted all remaining LLViewerStats to lltrace
2012-10-12SH-3405 WIP convert existing stats to lltrace systemRichard Linden
default to double precision now fixed unit conversion logic for LLUnit renamed LLTrace::Rate to LLTrace::Count and got rid of the old count as it was confusing some const correctness changes
2012-10-12SH-3275 WIP Update viewer metrics system to be more flexibleRichard Linden
cleaned up accumulator merging logic introduced frame recording to LLTrace directly instead of going through LLViewerStats moved consumer code over to frame recording instead of whatever the current active recording was
2012-10-10mergeRichard Linden
2012-10-10SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed units conversion so that trace getters return convertable units removed circular dependencies from lltrace* converted more stats to lltrace
2012-10-03SH-3405 WIP convert existing stats to lltrace systemRichard Linden
SH-3403 FIX implement unit conversion LLUnit implements unit tracking and conversion added support for LLUnit to LLTrace duplicated most llstats into LLTrace equivalents
2012-10-02SH-3404 create sampler classRichard Linden
renamed LLTrace::ThreadTrace to LLTrace::ThreadRecorder renamed LLTrace::Sampler to LLTrace::Recording
2012-10-01SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
cleaned up API samplers are now value types with copy-on-write buffers under the hood removed coupling with LLThread
2012-09-30SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
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-06Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
At Richard's suggestion, changed the bool merge parameter to new enum ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what we're requesting at the point of the call.
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
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-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-08-29SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
further cleanup of LLStat removed llfloaterlagmeter
2012-08-24Automated merge with http://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-07Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2012-08-07SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
cleaned up LLStat and removed unnecessary includes
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-23a trivial code change for SH-3073. The change makes sure to clear the ↵Xiaohong Bao
texture fetching queue ONLY once during a teleporting.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 20:18:59 +0000