Commits

Show all
Author Commit Message Labels Comments Date
max nikolenko
DRTVWR-232: MAINT-1440: FIXED Call Tools.TakeCopy instead of InspectObject.TakeFreeCopy
Tags
DRTVWR-232
Scott Lawrence
correct attribution for STORM-1868 (add Wolf Loonie)
Scott Lawrence
tag merge of DRTVWR-241
nat_linden
DRTVWR-241: resolve merge conflict with viewer-development. LLUI::setupPaths() went away with DRTVWR-210.
Tags
DRTVWR-241
nat_linden
nat_linden
Trivial commit to force TeamCity to generate a new codeticket number
nat_linden
nat_linden
Allow user to override either English, or localized, skinned file. Original LLDir::findSkinnedFilenames() implementation used a tricky rule: a given skin directory was only considered if it provided a default-language override for the sought filename, regardless of whether it also provided localizations for that filename. Discussion with Richard clarifies that we want to allow the user to override neither, either or both. Change findSkinnedFilenames() accordingly…
nat_linden
Remove LLUICtrlFactory::findSkinnedFilename(): cf. LLDir method. Richard points out that LLUICtrlFactory::findSkinnedFilename() adds little value. It was called from exactly one place, and that one place could easily obtain the information another way. The concern is that it could confuse a reader of the code with regard to the other findSkinnedFilename[s]() methods in LLDir. Clarifying the code base is a Good Thing. Removing.
nat_linden
Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init. Per code review: Previous refactoring of LLUI::locateSkin() preserved odd failure behavior: it would return last-considered pathname, whether or not it exists. Changed to emit LL_WARNS log message and return empty string. Use Boost.Assign to simplify initialization of a couple static containers in lldir.cpp.
nat_linden
LLUICtrlFactory::getLayeredXMLNode() gets LLDir::ESkinConstraint. 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_S…
nat_linden
Change LLDir::findSkinnedFilenames() to use enum instead of bool. 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.
nat_linden
Merge revised viewer_manifest.py rename logic
nat_linden
Use viewer_manifest.py magic to rename embedded html dir to html.old. Previous attempt at this same feat copied "*/html" and then iterated through every such directory in the copy-target space, renaming each individually with os.rename(). Richard kindly pointed out that it can be done more simply by using a viewer_manifest.py feature permitting wildcards even in dst= args.
nat_linden
Make LLTransUtil::parseStrings() merge all relevant strings.xml files. 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.
nat_linden
Remove HelpUseLocal setting variable. Hide local html skin dir. We assert that the local html directory is no longer used. Remove machinery related to its use, notably HelpUseLocal, the code that checks it and the code that sets and examines special flag URL "__local". Before actually killing off the local skins/default/html directory, make viewer_manifest.py rename it but continue packaging it as html.old. If this doesn't cause a panic, we can proceed with re…
nat_linden
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…
nat_linden
On lluuidhashmap_tut<1> failure, save/reload data in temp file. 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-gen…
nat_linden
#include <string.h> in v3color.h: recent Linux compilers care. Linux dev builds have started breaking because v3color.h uses strlen() and strncpy() without declaring them. Add relevant #include, which fixes.
Scott Lawrence
merge changes for 3.4.2-beta4
Scott Lawrence
tag merge of DRTVWR-210
nat_linden
DRTVWR-210: sanitize ampersand embedded in strings.xml messages
Tags
DRTVWR-210
nat_linden
nat_linden
Trivial commit to force TeamCity to generate a new codeticket number
nat_linden
nat_linden
STEAM-14: login when user presses Enter at username or password. The tricky thing about this fix is that the "Log In" button used to be in the same layout_panel as the username and password fields. Now it's not, so the fact that it's the default button for its layout_panel doesn't matter because that layout_panel doesn't have focus. Richard pointed out that we can make the commit action for the username and password fields initiate login -- as long as neither f…
nat_linden
LLPanelLogin::loadLoginPage() can now use "sourceid" settings var. Previously we borrowed the sourceid= param value from create_account_url, which we "happened to know" was overridden with the sourceid of interest. Now that we have a settings variable that directly captures sourceid, though, much more straightforward to use that.
nat_linden
Reference new "[sourceid]" substitution in "create_account_url". join.secondlife.com needs to know the sourceid as well as the user's language of choice. Ensure that sourceid gets passed with the URL.
nat_linden
Steam skin no longer needed: we can now embed "[sourceid]" in URLs. The whole point of --skin steam was to override (specifically) "create_account_url" in strings.xml, adding to each URL value a sourceid= URL parameter. Now we can do that more simply with '--set sourceid blah'. Less overhead, less maintenance, scales better to potential future sourceid values. Remove the steam skin.
nat_linden
Automated merge with file:///Users/nat/linden/viewer-sourceid
  1. Prev
  2. Next