summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
AgeCommit message (Expand)Author
2010-10-27Automated merge up from viewer-developmentLoren Shih
2010-10-26STORM-416 : merge with viewer-developmentMerov Linden
2010-10-20mergeDave Parks
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-19First stab at using GetObjectPhysicsDataDave Parks
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-07Add pure physics cost to UIDave Parks
2010-09-30Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low a...Merov Linden
2010-09-29SH-224 Add new streaming cost algorithm debug displays to viewer.Dave Parks
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-03Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Li...Aimee Linden
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-26Fix for various physics shape rendering glitches.Dave Parks
2010-08-25mergeDave Parks
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-12merge from viewer-releaseTofu Linden
2010-08-11EXT-8650 Can wear mutliple copies of a no-copy item via object linksLoren Shih
2010-07-09Gravity, Friction, Restitution, Density now work with simulator.Matthew Breindel (Falcon)
2010-07-01added new physics parameters to primsKarl Stiefvater (qarl)
2010-06-10mergeDave Parks
2010-06-03Vectorized octree and much of llspatialpartition and lldrawable.Dave Parks
2010-05-15Highlight for object cost and proper retrieval/display of prim object cost an...Dave Parks
2010-05-13Vis that works and first pass at fetching prim cost.Dave Parks
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-01Rigged attachment integration WIP.Dave Parks
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
2010-03-31DEV-47845 Cleaned up names.Matthew Breindel (Falcon)
2010-03-26DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so...Matthew Breindel (Falcon)
2010-02-26Removed unnecessary include llhudtext.h from llviewerobject.hJames Cook
2010-02-25LOD tweaking (sort of) works again in importer.Dave Parks
2009-12-01EXT-2719 - put on menu now gets disabled if the object is lockedEric M. Tulla (BigPapi)
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-10-16svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-06-27fix for DEV-27483/SEC-283: Viewer crash: LLXform::setParent Creating loop whe...Xiaohong Bao
2009-06-23Fixed a bunch of missing includes and forward declares. I was trying to benc...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 07:07:14 +0000