summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-10-10On lluuidhashmap_tut<1> failure, save/reload data in temp file.Nat Goodspeed
Generating new random data on every test run makes it impossible to debug a test failure. While in general we do want to generate random data to thoroughly exercise the generator logic, if every new run generates new data, the only thing we can do about an observed failure is shrug and ignore it. Add logic to save data on failure, with corresponding logic to notice and reload from a previously-generated save file. In case of a merge collision, this version SUPERCEDES my previous efforts with this file. (My other changes may still be in a backed-up merge request.) It is okay to resolve collisions in favor of this version.
2012-10-10#include <string.h> in v3color.h: recent Linux compilers care.Nat Goodspeed
Linux dev builds have started breaking because v3color.h uses strlen() and strncpy() without declaring them. Add relevant #include, which fixes.
2012-09-19Added tag 3.4.0-release for changeset 97977c67245fOz Linden
2012-09-19merge beta7 pathfinding hotfixesOz Linden
2012-09-14Added tag 3.4.0-beta7 for changeset 733ceac77583William Todd Stinson
2012-09-14tag merge of DRTVWR-215William Todd Stinson
2012-09-13MAINT-1561: BUGFIX Another target omega fix for an issue detected with a ↵William Todd Stinson
clock pendulum.
2012-09-12Added tag 3.4.0-release for changeset d02759655d6bOz Linden
2012-09-11Added tag 3.3.4-beta6 for changeset 62b07aa81b19Oz Linden
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-11tag merge of DRTVWR-213Oz Linden
2012-09-11merge changes for DRTVWR-212Oz Linden
2012-09-11tag merge of DRTVWR-212Oz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-08-31merge changes forOz Linden
2012-08-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-08-31Added tag 3.3.4-release3 for changeset 351eea5f9dc1Oz Linden
2012-08-31tag merge of DRTVWR-207Oz Linden
2012-08-30Added tag 3.4.0-beta5 for changeset 573e863be2f2Oz Linden
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
Reviewed by me. (Bao created)
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later ↵William Todd Stinson
comparison to the previous angular velocity.
2012-08-27PATH-868: Ensuring that walkability values are reset to a previous value if ↵Todd Stinson
the empty string is entered.
2012-08-27MAINT-1480: Clearing the angular velocity accummulation when the updated ↵Todd Stinson
angular velocity is set to zero.
2012-08-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-22PATH-864: Altering the minimum linksets floater size to smaller to allow ↵Todd Stinson
fitting to 1024 width screens.
2012-08-22Added tag 3.4.0-beta4 for changeset 84fb70dfe344Oz Linden
2012-08-22merge changes for DRTVWR-201Oz Linden
2012-08-22tag merge of DRTVWR-201Oz Linden
2012-08-22merge changes forOz Linden
2012-08-21storm-1906: correct cmake error when using precompiled llphysicsextensions_tpvOz Linden
2012-08-20Added tag 3.4.0-beta3 for changeset 182a9bf30e81Oz Linden
2012-08-20tag merge of DRTVWR-200Oz Linden
2012-08-20Added tag 3.3.4-release2 for changeset 7c9102fb9988Oz Linden
2012-08-20tag merge of DRTVWR-199Oz Linden
2012-08-17MAINT-1439: BUGFIX Correcting Kart 1.0 issue with physical objects using ↵Todd Stinson
angular velocity.
2012-08-16Added tag 3.4.0-beta2 for changeset b1dbb1a83f48Oz Linden
2012-08-16merge changes for DRTVWR-197Oz Linden
2012-08-16tag merge of DRTVWR-197Oz Linden
2012-08-16PATH-852: Attempting to fix the format of the BMP cursors for linux.Todd Stinson
2012-08-15merge changes for DRTVWR-198Oz Linden
2012-08-15tag merge of DRTVWR-198Oz Linden
2012-08-15tag merge of DRTVWR-196Oz Linden
2012-08-1510.5 macs will begin looking for mac_legacy rather than macAura Linden
2012-08-14MAINT-1413,MAINT-1425,MAINT-1426: BUGFIX Correcting a problem where the ↵Todd Stinson
build/edit floater was being dirtied at the wrong time.
2012-08-14PATH-842: Another tweak to get the llSetTargetOmega functionality working in ↵Todd Stinson
the viewer.
2012-08-14PATH-856: Adding a new notification to indicate when the user will be ↵Todd Stinson
toggling the phantom flag of a linkset through the Pathfinding Linksets floater.
2012-08-14PATH-854: Adding support to display whether linksets are scripted or not in ↵Todd Stinson
the pathfinding linksets floater.
2012-08-14PATH-849: Group objects were losing their [group] identifier following the ↵Todd Stinson
last commit. This should fix that issue.
2012-08-14open-146: correct licenses in llphysicsextensions stubOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-07 00:03:40 +0000