summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-16Automated merge with file:///Users/nat/linden/viewer-sourceidNat Goodspeed
2012-10-16Introduce LLAppViewer::initStrings(); reload default_trans_args.Nat Goodspeed
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 setDefaultArg() call of its own. All this is way too much logic to replicate in both LLAppViewer::initConfiguration() and init(), so break out new LLAppViewer::initStrings() method and call it from both places.
2012-10-15Add 'sourceid' settings var specifically for skin-files insertion.Nat Goodspeed
Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that "[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
2012-09-11Resync steam/xui/*/strings.xml with default/xui/*/strings.xml.Nat Goodspeed
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.
2012-09-11Merge up to http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-09-10inconsequential change to force new buildOz Linden
2012-09-07Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-07MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS XDave Parks
2012-09-06Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-05Reapply f6ed57210865 to zh/notifications.xml: remove "FirstRun" link.Nat Goodspeed
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.
2012-09-05Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-09-04merge changes for DRTVWR-207Oz Linden
2012-09-04merge changes for DRTVWR-206Oz Linden
2012-09-04tag merge of DRTVWR-206Oz Linden
2012-08-31merge changes forOz Linden
2012-08-31Copy sourceid= from create_account_url to login-page URL.Nat Goodspeed
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.
2012-08-31Now that LLURI isn't broken, use it to construct login-page URL.Nat Goodspeed
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().
2012-08-31Fix longstanding LLURI::buildHTTP() bug when passing string path.Nat Goodspeed
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 appended the entire passed string. While that might be fine for a 'path' consisting of a single undecorated path component, the available documentation does not forbid one from passing a path containing slashes as well. But this had the dubious effect of replacing every slash with %2F. In particular, decomposing a URL string with one LLURI instance and constructing another like it using LLURI::buildHTTP() was not symmetrical. Having consulted with Richard, I made the string-path logic a bit more nuanced: - The passed path string is split on slashes. Every path component is individually escaped, then recombined with slashes into the final path. - Duplicate slashes are eliminated. - The presence or absence of a trailing slash in the original path string is carefully respected. Now that we've nailed down how it ought to behave -- added unit tests to ensure that it DOES behave that way!!
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-30WIP INTL-46 Set24 translation for traditional chinese; add new files; remove ↵eli
obsolete files
2012-08-30FIX INTL-101 translation of set33 for 8 languages; add new files; remove ↵eli
obsolete files
2012-08-29MAINT-1491 Make GPU table more readable, clear out some cruft, and start ↵Dave Parks
reporting raw GL strings in viewer stats instead of GPU table labels to make future GPU table overhauls more effective.
2012-08-29MAINT-1491 Add Intel HD Graphics entries.Dave Parks
2012-08-29merge changes for DRTVWR-205Oz Linden
2012-08-29tag merge of DRTVWR-205Oz Linden
2012-08-29MAINT-1491 Add Radeon HD 7xxx chips, get rid of "ATI Technologies" catch ↵Dave Parks
all, split up NVIDIA GT(X) 6xx series into mobile/desktop.
2012-08-29WIP INTL-46 Traditional Chinese translation for Set23TW (120829)eli
2012-08-29MAINT-1497 Remove "ATI Geforce" lines (also add "expected OpenGL version" field)Dave Parks
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
Reviewed by me. (Bao created)
2012-08-29Added tag oz-build-test-tag for changeset 34dbbe2b00afOz Linden
2012-08-28MAINT-1491 Tuned analysis function for more consistent resultsDave Parks
2012-08-28MAINT-1491 Integration of statistically generated GPU table -- enable ↵Dave Parks
shadows by default where appropriate.
2012-08-23pull back beta tagOz Linden
2012-08-22MAINT-1444: Make bottom-right corner of new login panel overlap.Nat Goodspeed
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.
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22tag merge of DRTVWR-202Oz Linden
2012-08-22Added tag 3.4.0-beta4 for changeset 84fb70dfe344Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22pull back release hotfix and beta fixesOz 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-22merge changes for DRTVWR-203Oz Linden
2012-08-22tag merge of DRTVWR-203Oz Linden
2012-08-22merge back 3.4.0-beta3 fixesOz 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