summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2010-08-30merging up from viewer-developmentAaron Terrell (Enus)
2010-08-26CTS-219 Fix for broken geometry when importing from polygons.Dave Parks
2010-08-26Add missing files from viewer-experimentalDave Parks
2010-08-24standardizing test suite names as class name under testAaron Terrell (Enus)
2010-08-24fixing test names for reporting purposes - removing ' test'. also, updated ↵Aaron Terrell (Enus)
docs to remove that naming schema
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu 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-05merge from viewer2 trunk.Tofu Linden
2010-02-02Trying to resolve a strange crash in LLUUID::isNull()... by avoiding it for now.Tofu Linden
2010-02-02Trying to resolve a strange crash in LLUUID::isNull()... by avoiding it for now.Tofu Linden
2010-02-01Use "standard" llsd::equalsRick Pasetto
2010-02-01start to abstract-out the 'is a spotlight' question so one day we can ↵Tofu Linden
perhaps make the UI hurt less.
2010-02-01start to abstract-out the 'is a spotlight' question so one day we can ↵Tofu Linden
perhaps make the UI hurt less.
2010-01-29merge from viewer2.Tofu Linden
2010-01-29CID-329Tofu 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-29CID-330Tofu Linden
Checker: UNINIT_CTOR Function: LLMaterialTable::LLMaterialTable() File: /indra/llprimitive/llmaterialtable.cpp
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-28CID-331Tofu Linden
Checker: UNINIT_CTOR Function: LLPrimitive::LLPrimitive() File: /indra/llprimitive/llprimitive.cpp
2009-12-07Merge of viewer 2 changesPalmer
2009-11-28Migrated LLUUIDs and some float constants out of headers into .cpp filesJames Cook
Moved some functions with llinfos into .cpp files Linker optimizations, all
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
2009-11-10Fix for Windows compile error.Steve Bennetts
2009-11-10FIX 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-07Fix for missing LOD spam.Dave Parks
2009-11-05Fix for prims all being 0 lod.Dave Parks
Fix for dangling prim references.
2009-11-05Fix for crash on teleport to mesh enabled region.Dave Parks
Fix for flashing meshes on LOD switch.
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-02Repairing things that didn't quite merge properly.Palmer
2009-11-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-19mergeSteve Bennetts
2009-10-16svn 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-07Merged latest viewer/login-api with latest viewer/viewer-20brad kittenbrink
2009-10-05FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URLRick Pasetto
2009-10-05merge with latest from lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-04Changed 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-02Patches follow merge to latest viewer-20 updatesMark Palange (Mani)
2009-10-02merge of latest viewer/viewer-20Mark Palange (Mani)
2009-10-01merge of latest lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-01svn 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-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
2009-09-26Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20Nat Goodspeed
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-01Fix up some more post-merge breakage.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 13:00:37 +0000