viewer.git - Megapahit's fork of the Second Life viewer.

Age	Commit message (Collapse)	Author
2010-09-22	merge	Dave Parks

2010-09-22	SH-100, SH-111 Fix for generate normals stalling/crashing.	Dave Parks
	Switch from "new" to "malloc" in llvolume.cpp aligned arrays so "realloc" can be used to avoid copies.
2010-09-21	Fix for build failures - disabling tcmalloc for now	Brad Payne (Vir Linden)

2010-08-26	CTS-219 Fix for broken geometry when importing from polygons.	Dave Parks

2010-08-26	Add missing files from viewer-experimental	Dave Parks

2010-02-05	merge from viewer2 trunk.	Tofu Linden

2010-02-02	Trying to resolve a strange crash in LLUUID::isNull()... by avoiding it for now.	Tofu Linden

2010-02-01	Use "standard" llsd::equals	Rick Pasetto

2010-02-01	start to abstract-out the 'is a spotlight' question so one day we can ↵	Tofu Linden
	perhaps make the UI hurt less.
2010-01-29	merge from viewer2.	Tofu Linden

2010-01-29	CID-329	Tofu Linden
	Checker: UNINIT_CTOR Function: LLMaterialInfo::LLMaterialInfo(unsigned char, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&, const LLUUID &) File: /indra/llprimitive/llmaterialtable.h
2010-01-29	CID-330	Tofu Linden
	Checker: UNINIT_CTOR Function: LLMaterialTable::LLMaterialTable() File: /indra/llprimitive/llmaterialtable.cpp
2010-01-28	Merge from viewer2 trunk.	Tofu Linden

2010-01-28	CID-331	Tofu Linden
	Checker: UNINIT_CTOR Function: LLPrimitive::LLPrimitive() File: /indra/llprimitive/llprimitive.cpp
2009-12-07	Merge of viewer 2 changes	Palmer

2009-11-28	Migrated LLUUIDs and some float constants out of headers into .cpp files	James Cook
	Moved some functions with llinfos into .cpp files Linker optimizations, all
2009-11-17	Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0	Palmer

2009-11-11	Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵	Palmer
	and more mesh inventory type info
2009-11-10	Fix for Windows compile error.	Steve Bennetts

2009-11-10	FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have ↵	Rick Pasetto
	a contract conflict Review #32 This code will go into both server 1.32 branch and the viewer branch. As proposed in DEV-41949, I've changed setWhitelist(const LLSD &whitelist) to clear the whitelist if the WHITELIST_KEY is not present in the passed-in 'whitelist'. I've also made sure that asLLSD() ensures that the WHITELIST_KEY is erased in the given LLSD.
2009-11-07	Fix for missing LOD spam.	Dave Parks

2009-11-05	Fix for prims all being 0 lod.	Dave Parks
	Fix for dangling prim references.
2009-11-05	Fix for crash on teleport to mesh enabled region.	Dave Parks
	Fix for flashing meshes on LOD switch.
2009-11-04	Redo Bao's broken merge	Bryan O'Sullivan

2009-11-02	Repairing things that didn't quite merge properly.	Palmer

2009-11-02	Merge of viewer-2-0 changes	Palmer

2009-11-02	Sync up with render-pipeline-7 ignore-dead-branch	David Parks

2009-10-19	merge	Steve Bennetts

2009-10-16	svn merge -r134817:136516 ↵	Loren Shih
	svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-32867 : Avatar Pipeline Project - Multi-Attachments This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly. Reviewed by: Vir.
2009-10-07	Merged latest viewer/login-api with latest viewer/viewer-20	brad kittenbrink

2009-10-05	FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URL	Rick Pasetto

2009-10-05	merge with latest from lindenlab/svn-imports-viewer-20	Mark Palange (Mani)

2009-10-04	Changed license to Viewer GPL to try to fix the Linux build export. Code ↵	James Cook
	consists of 4 function stubs, I don't think it's proprietary/internal.
2009-10-02	Patches follow merge to latest viewer-20 updates	Mark Palange (Mani)

2009-10-02	merge of latest viewer/viewer-20	Mark Palange (Mani)

2009-10-01	merge of latest lindenlab/svn-imports-viewer-20	Mark Palange (Mani)

2009-10-01	svn merge -r 134922:134973 ↵	Monroe Williams
	svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-09-30	QAR-1619: merge up to 2009-09-26 viewer/viewer-20	Nat Goodspeed

2009-09-26	Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20	Nat Goodspeed

2009-09-22	Merging render-pipeline-6-qa-2 into viewer-2	David Parks
	Self reviewed.
2009-09-18	Merged latest viewer/viewer-20 into login-api.	brad kittenbrink

2009-09-01	Fix up some more post-merge breakage.	brad kittenbrink

2009-08-31	Merge with trunk	Bryan O'Sullivan

2009-07-29	svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737	Christian Goetze
	effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
2009-07-15	svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691	Christian Goetze
	Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 QAR-1691
2009-07-07	svn merge -r 126003:126087 ↵	Don Kjer
	svn+ssh://svn/svn/linden/qa/light-texture-params/light-texture-params-2 into trunk
2009-07-01	svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654	Christian Goetze
	QAR-1654 merge completed.
2009-06-22	Merge with viewer-2.0.0-3 branch	Bryan O'Sullivan

2009-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
2009-05-22	DEV-27646 dll linkage for login module.	Brad Kittenbrink
	Ok, finally got this to a point where it doesn't break the build and I can check in. llcommon can be built as a shared library (disabled but can be enabled with cmake cache var LLCOMMON_LINK_SHARED. reviewed by Mani on tuesday (I still need to get his suggested changes re-reviewed)