Commits

Show all
Author Commit Message Labels Comments Date
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
nat_linden
Introduce LLAppViewer::initStrings(); reload default_trans_args. Calling LLTrans::setDefaultArg() after LLTransUtil::parseStrings() is almost good enough -- but it fails to address the case in which one or more of the default_trans_args strings (e.g. "create_account_url") embeds a reference to the new substitution. So after the setDefaultArg() call, go back through default_trans_args, refetching each string to perform the substitution and updating it with a set…
nat_linden
Add 'sourceid' settings var specifically for skin-files insertion. Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that "[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
nat_linden
Resync steam/xui/*/strings.xml with default/xui/*/strings.xml. The steam/xui/*/strings.xml files are intended only to override a single string (create_account_url). But until the strings.xml C++ code supports fallback to the default skin, we must manually keep them synchronized except for that one string.
nat_linden
nat_linden
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
davep
MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS X
nat_linden
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
davep
MAINT-1491 Make GPU table more readable, clear out some cruft, and start reporting raw GL strings in viewer stats instead of GPU table labels to make future GPU table overhauls more effective.
davep
MAINT-1491 Add Intel HD Graphics entries.
davep
MAINT-1491 Add Radeon HD 7xxx chips, get rid of "ATI Technologies" catch all, split up NVIDIA GT(X) 6xx series into mobile/desktop.
davep
MAINT-1497 Remove "ATI Geforce" lines (also add "expected OpenGL version" field)
davep
MAINT-1491 Tuned analysis function for more consistent results
davep
MAINT-1491 Integration of statistically generated GPU table -- enable shadows by default where appropriate.
nat_linden
Reapply f6ed57210865 to zh/notifications.xml: remove "FirstRun" link. Because create_account_url should vary between viewer languages and skins, we've made an effort to ensure that create_account_url is used everywhere, instead of directly embedding http://join.secondlife.com. Recent rev 6ee71714935f accidentally reinserted the link embedded in the "FirstRun" notification for language 'zh'. Delete it again.
nat_linden
nat_linden
Copy sourceid= from create_account_url to login-page URL. This allows the login-page server to respond to any sourceid= associated with the create_account_url, which (we happen to know) varies by skin -- e.g. for the Steam viewer.
nat_linden
Now that LLURI isn't broken, use it to construct login-page URL. Previous logic constructed a std::ostringstream, directly messing with '?' vs. '&', ugly libcurl escape calls etc. Now we can deconstruct the LLGridManager:: getLoginPage() URL, supplement the params map as needed and then rebuild a new URL using LLURI::buildHTTP().
nat_linden
Fix longstanding LLURI::buildHTTP() bug when passing string path. The LLURI::buildHTTP() overloads that take an LLSD 'path' accept 'undefined', LLSD::String and (LLSD::Array of LLSD::String). A sequence of path components passed in an Array is constructed into a slash-separated path. There are unit tests in lluri_test.cpp to exercise that case. To my amazement, there were NO unit tests covering the case of an LLSD::String path. The code for that case escaped and…
nat_linden
MAINT-1444: Make bottom-right corner of new login panel overlap. MAINT-1444 complains that with all optional login-panel controls enabled, the login panel is wider than 1024 pixels: at that width, the new "Start now" button is pushed completely off the right edge of the window. Richard told me how to tweak the layout so that the controls can squeeze together in an overlapping way, enabling all controls to be visible even at 1024 width.
  1. Prev
  2. Next