summaryrefslogtreecommitdiff
path: root/indra/llui/lltransutil.cpp
AgeCommit message (Collapse)Author
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-10-12LLUICtrlFactory::getLayeredXMLNode() gets LLDir::ESkinConstraint.Nat Goodspeed
At this point, LLUICtrlFactory::getLayeredXMLNode() is a pretty thin wrapper around LLDir::findSkinnedFilenames() and LLXMLNode::getLayeredXMLNode(). Until now, LLUICtrlFactory::getLayeredXMLNode() passed (by default) LLDir::CURRENT_SKIN to LLDir::findSkinnedFilenames(). But that meant that a caller such as LLTransUtil::parseStrings() that wants almost the same functionality, but with LLDir::ALL_SKINS instead, had to clone the logic from LLUICtrlFactory::getLayeredXMLNode(). Allowing its caller to pass the desired LLDir::ESkinConstraint enum value eliminates the need to clone its logic. Remove cloned logic from LLTransUtil::parseStrings().
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-11Make LLTransUtil::parseStrings() merge all relevant strings.xml files.Nat Goodspeed
Until now, adding a xui/en/strings.xml file in any non-default skin meant you had to clone the entire file, editing only the particular entries you wanted to override. With this change, we load strings.xml file(s) from the default skin before loading the specified skin -- so a non-default skin can now provide a strings.xml file containing only the specific entries it wants to override.
2011-05-05Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated ↵brad kittenbrink
a bunch of unnecesary header dependencies.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2009-08-21svn merge -r130238:130240 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6 QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring