summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-11-13DRTVWR-210: sanitize ampersand embedded in strings.xml messagesNat Goodspeed
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13MAINT-1890: Adding a more descriptive comment to this hack fix for future ref...William Todd Stinson
2012-11-13MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve HUD...William Todd Stinson
2012-11-13merge changes for DRTVWR-238Oz Linden
2012-11-13merge changes for DRTVWR-209Oz Linden
2012-11-12MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring the...William Todd Stinson
2012-11-12MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() metho...William Todd Stinson
2012-11-08merge up to viewer-developmentOz Linden
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06pull back changes from 3.4.2-beta1Oz Linden
2012-11-05STEAM-14: login when user presses Enter at username or password.Nat Goodspeed
2012-11-05merge up to latest viewer-developmentOz Linden
2012-10-23Allow user to override either English, or localized, skinned file.Nat Goodspeed
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
2012-10-16LLPanelLogin::loadLoginPage() can now use "sourceid" settings var.Nat Goodspeed
2012-10-16Reference new "[sourceid]" substitution in "create_account_url".Nat Goodspeed
2012-10-16Steam skin no longer needed: we can now embed "[sourceid]" in URLs.Nat Goodspeed
2012-10-16Automated merge with file:///Users/nat/linden/viewer-sourceidNat Goodspeed
2012-10-16Introduce LLAppViewer::initStrings(); reload default_trans_args.Nat Goodspeed
2012-10-15Add 'sourceid' settings var specifically for skin-files insertion.Nat Goodspeed
2012-10-15Remove LLUICtrlFactory::findSkinnedFilename(): cf. LLDir method.Nat Goodspeed
2012-10-12Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init.Nat Goodspeed
2012-10-12LLUICtrlFactory::getLayeredXMLNode() gets LLDir::ESkinConstraint.Nat Goodspeed
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
2012-10-11Merge revised viewer_manifest.py rename logicNat Goodspeed
2012-10-11Use viewer_manifest.py magic to rename embedded html dir to html.old.Nat Goodspeed
2012-10-11Make LLTransUtil::parseStrings() merge all relevant strings.xml files.Nat Goodspeed
2012-10-10Remove HelpUseLocal setting variable. Hide local html skin dir.Nat Goodspeed
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
2012-10-10On lluuidhashmap_tut<1> failure, save/reload data in temp file.Nat Goodspeed
2012-10-10#include <string.h> in v3color.h: recent Linux compilers care.Nat Goodspeed
2012-09-11Resync steam/xui/*/strings.xml with default/xui/*/strings.xml.Nat Goodspeed
2012-09-08DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
2012-09-07DRTVWR-209 Additional merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
2012-09-07Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
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-05[MAINT-513] Large group managementBaker Linden
2012-09-05Reapply f6ed57210865 to zh/notifications.xml: remove "FirstRun" link.Nat Goodspeed
2012-09-05Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-09-04WIP INTL-46 Set25, Set26, Set27 translations for traditional chinese; add new...eli
2012-09-04viewer-development mergeChris Baker