Nyx Linden 11fe124ae9 merging in viewer-beta. ... Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.		2013-01-24 16:22:49 -05:00
..
tests	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00
CMakeLists.txt	Updating linux build to gcc4.6	2012-10-11 00:09:04 +00:00
llcontrol.cpp	EXP-1942,EXP-1945: Altering behavior when setting maturity preference to 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-05-24 19:41:20 -07:00
llcontrol.h	Fixed LLControlGroup::get() template to not crash on missing items. Reviewed	2012-10-02 09:31:38 -07:00
llcontrolgroupreader.h	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00
llxmlnode.cpp	Make LLTransUtil::parseStrings() merge all relevant strings.xml files.	2012-10-11 17:29:04 -04:00
llxmlnode.h	SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory	2011-03-09 00:21:57 -08:00
llxmlparser.cpp	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00
llxmlparser.h	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00
llxmltree.cpp	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00
llxmltree.h	correct licenses (fix problem with license change merge)	2010-10-13 07:24:37 -04:00