summaryrefslogtreecommitdiff
path: root/indra/llxml
AgeCommit message (Collapse)Author
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-11Viewer-chui mergeprep
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ↵Don Kjer
http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-02Fixed LLControlGroup::get() template to not crash on missing items. Reviewedsimon@Simon-PC.lindenlab.com
by Kelly
2012-09-13Fleshed out target_link_libraries dependencies between libraries. ↵Don Kjer
Appearance utility now reads avatar_lad.xml during stubbed out params processing.
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.
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-24fix for gcc buildsRichard Linden
2012-07-23CHUI-227 FIX Teleport offers sent are not receivedRichard Linden
cleaned up serialization of LLSD to param block so that it can round-trip also, optimized LLXMLNode and fixed an assert
2012-05-24EXP-1942,EXP-1945: Altering behavior when setting maturity preference to ↵Todd Stinson
check the server response in an effort to ensure the viewer and server remain in sync. This is a partial commit as I still need to add user behavior and notifications when things go wrong.
2012-02-06EXP-1849 FIXED Privacy settings could be set to default when modifying other ↵Vadim ProductEngine
preferences before login.
2012-02-01converted a bunch of narrowing implicit conversions to explicitRichard Linden
2012-01-23EXP-1837 FIX parsing notifications.xml during startup can take > 40 seconds ↵Richard Linden
(in non-release builds) removed O(n^2) comparisons of XML nodes in favor of O(n)
2011-11-28a try fix for sh-2651: [crashhunters] Crash after google translate failureXiaohong Bao
and sh-2658: crash in LLPluginMessage::parse
2011-11-22remove redundant memory allocation for sh-2651: [crashhunters] Crash after ↵Xiaohong Bao
google translate failure
2011-09-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-09-01CHOP-763: publish LLControlGroup::typeStringToEnum(), typeEnumToString()Nat Goodspeed
These LLControlGroup methods were marked 'protected'. But they're important for introspection: LLControlVariable::type() returns an eControlType; understanding that value outside a C++ context requires typeEnumToString().
2011-08-31MergeXiaohong Bao
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-05-12mergeDave Parks
2011-04-27Incorporated some suggestions from code review for VWR-25610brad kittenbrink
2011-04-26FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of ↵brad kittenbrink
large LLSD objects.
2011-03-09SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged ↵Richard Linden
into Minimal skin are declined and not present in inventory made notification text skinnable
2011-03-16Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-23Merge from viewer-developmentXiaohong Bao
2011-02-22SOCIAL-545 WIP Figure out how to configure skylight-specific settings while ↵Richard Linden
retaining relevant user settings (login account name, etc.) converted settings_file.xml to use param block descriptions for easier modification added session settings file and user session settings file for per-session config overrides
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-03first iteration of memory pool codeXiaohong Bao
2010-12-02mergeMonroe Linden
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-09Add name, value info to convert_from_llsd<> specialization LL_ERRS.Nat Goodspeed
Prior to this, you could get a viewer crash whose ERROR: message said only: convert_from_llsd<std::string>: Invalid string value This gave no hint as to *which value* was wrong, or where to go fix it. Ironically, each convert_from_llsd<> specialization already has the control_name and LLSD value in hand; added these to each such LL_ERRS message.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-07fix for gccRichard Linden
2010-10-06allow passing LLSD arguments on command lineRichard Nelson
2010-09-30Put some errant tests under if (LL_TESTS) conditional.Dave Parks
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-18VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake filesAimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-02-03CID-266Tofu Linden
Checker: UNINIT_CTOR Function: LLXmlTreeParser::LLXmlTreeParser(LLXmlTree *) File: /indra/llxml/llxmltree.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 22:23:26 +0000