Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-10-04 | Pull merge of lindenlab/viewer-release | Merov Linden | |
2013-08-28 | merging viewer release | Gilbert Gonzales | |
2013-08-26 | Merge downstream code from CHUIStorm release | simon | |
2013-08-07 | merge changes for DRTVWR-333 | Oz Linden | |
2013-07-25 | CHOP-962: Make LLControlVariable::setPersist() accept only enum. | Nat Goodspeed | |
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review. | |||
2013-07-17 | CHOP-962: Make LLControlGroup::declare* return LLControlVariable* | Nat Goodspeed | |
LLControlGroup::declareControl(), declareString() etc. etc. all used to return BOOL -- which no one ever examines because it unconditionally returned TRUE. Make it return the (possibly new) LLControlVariable* instead. | |||
2013-07-09 | CHOP-963: Make update service query url depend on the grid rather than settings | Oz Linden | |
2013-06-21 | Automated merge with file:///F:%5Cviewer-bear | Dave Parks | |
2013-06-19 | Pull merge from lindenlab/viewer-release | Merov Linden | |
2013-05-22 | Pull merge from viewer-release | Merov Linden | |
2013-05-11 | Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵ | Graham Madarasz | |
material instead of mMaterial | |||
2013-05-10 | merge changes for 3.5.2-beta4 | Oz Linden | |
2013-05-09 | Merge downstream code and viewer-beta | simon | |
2013-05-08 | Adding follow_redirects parameter to LLHTTPClient get/head variants. Not ↵ | Don Kjer | |
following redirects for facebook connect requests. | |||
2013-05-01 | Merge vwr-dev-mat | Graham Madarasz | |
2013-04-30 | Merge 3.5.1 into Materials | Graham Madarasz | |
2013-04-24 | diff -r 59c7bed66dfd indra/llcommon/lleventapi.h | simon | |
2013-04-19 | merge up to latest viewer-development for merge to 3.5.2 | Oz Linden | |
2013-04-19 | merge changes for DRTVWR-294 | Oz Linden | |
2013-04-16 | merge up to 3.5.2 development | Oz Linden | |
2013-04-11 | Merge in downstream code (chui fixes, materials) | simon | |
2013-03-29 | Update Mac and Windows breakpad builds to latest | Graham Madarasz | |
2013-03-20 | Removed avatar stuff from asset metrics, again. Must have gotten broken in a ↵ | Brad Payne (Vir Linden) | |
merge at some point. | |||
2013-03-11 | merge | prep | |
2013-03-11 | merge | prep | |
2013-03-11 | more test build fix | Brad Payne (Vir Linden) | |
2013-03-11 | Viewer-chui merge | prep | |
2013-03-11 | Fix for build failure in tests | Brad Payne (Vir Linden) | |
2013-03-05 | Fixing 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-03-01 | Fix integration tests broken by instancetracker changes | Graham Madarasz (Graham) | |
2013-02-11 | fix for build failure on test w/linux | Brad Payne (Vir Linden) | |
2013-02-11 | SH-3852 WIP - removed avatar metrics from ViewerAssetMetrics | Brad Payne (Vir Linden) | |
2013-01-24 | merging in viewer-beta. | Nyx Linden | |
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh. | |||
2012-12-17 | Pull and merge from https://bitbucket.org/lindenlab/viewer-development. | William Todd Stinson | |
2012-12-11 | Merged from viewer-release | Aura Linden | |
2012-12-05 | Linux Viewer build fixes. | Logan Dethrow | |
* Removed no longer used unpack_bufsize from bitpack_test.cpp * Added llviewertexture_stub.cpp to the newview tests directory to fix llworldmap_test.cpp and llworldmipmap_test.cpp linker errors. | |||
2012-11-28 | SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵ | prep | |
alignment issue in llAppearance. | |||
2012-11-21 | Pull and merge https://bitbucket.org/lindenlab/viewer-development. | William Todd Stinson | |
2012-11-13 | Pull and merge from https://bitbucket.org/lindenlab/viewer-development. | William Todd Stinson | |
2012-11-12 | Ported slplugin and some other missing components for cocoa. | Aura Linden | |
2012-11-07 | Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code. | Monty Brandenberg | |
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x. | |||
2013-03-27 | change login to pass only the version instead of channel+version in the ↵ | Oz Linden | |
version parameter (channel is passed separately) | |||
2013-03-27 | add platform and platform version to login request parameters for new ↵ | Oz Linden | |
version manager query | |||
2013-02-21 | add use of v1.1 update request protocol, with fallback to v1.0 | Oz Linden | |
2013-02-07 | derive version number from indra/VIEWER_VERSION.txt | Oz Linden | |
2012-10-11 | Pull and merge from https://bitbucket.org/lindenlab/viewer-development. | William Todd Stinson | |
2012-10-10 | pull back 3.4.1-beta6 fixes | Oz Linden | |
2012-10-09 | Initial pass at getting a list of viewer objects with non-null material IDs. | William Todd Stinson | |
2012-10-03 | Fix for tests | Dave Parks | |
2012-09-08 | DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code. | Monty Brandenberg | |
cmake and other files didn't get moved over, do it by hand. |