summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
AgeCommit message (Expand)Author
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-355Tofu Linden
2010-01-20merge.Tofu Linden
2010-01-20FIX EXT-4052: Make sure bounceback url has a schemeRick Pasetto
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-19FIX EXT-4468 DEV-41991: Make selected objects "more important" when loading t...Rick Pasetto
2010-01-13Merge.Tofu Linden
2010-01-08code review feedback: fixed commentRick Pasetto
2010-01-08FIX EXT-4052: don't bounce back if url does not pass whitelistRick Pasetto
2010-01-07Merge latest fixes from viewer2.Tofu Linden
2010-01-07EXT-3973 viewer crashNyx (Neal Orman)
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-18Slight hack: if pixel area is 1024, force recalculation of itRick Pasetto
2009-12-15Add a PrimMediaMasterEnabled debug flag to allow us to disable the media data...Rick Pasetto
2009-12-15mergeDave Parks
2009-12-15HTTP Mesh transfer relatively blocking-free.Dave Parks
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-11HTTP Mesh fetch FTW.. still bustedDave Parks
2009-12-11Mergeskolb
2009-12-14Change LLViewerMedia::isInterestingEnough() to also check selectionRick Pasetto
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-14Allow selection of media faces even if there is no impl. We recordRick Pasetto
2009-12-11EXT-2718 avatar render cost higher in 2.0 than in 1.23Nyx (Neal Orman)
2009-12-10PARTIAL DEV-43869 - add "isInterestingEnough()" to the queue calculationRick Pasetto
2009-12-10PARTIAL DEV-43869: LLMediaDataClient now uses two queuesRick Pasetto
2009-12-07Merge of viewer 2 changesPalmer
2009-12-01Fix a signed/unsigned warning that breaks the Windows build.callum
2009-12-01Fix for EXT-2836 (Changing texture on Media on a Prim face removes MoaP funct...Monroe Linden
2009-11-30Linker optimization - use "extern template" for commonly regenerated templatesJames Cook
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-25Fix for spam on invalid mesh asset.Dave Parks
2009-11-24mergeLoren Shih
2009-11-24Fix for copying of tetrahedrons in place of mesh LODs.Dave Parks
2009-11-23EXT-2718 EXT-2434 avatar render cost changesNyx (Neal Orman)
2009-11-20Clean up some loggingRick Pasetto
2009-11-19Made LLMediaDataClient not send requests on behalf of objects that are marked...Monroe Linden
2009-11-19Added LLVOVolume::markDead(), which unhooks any prim media instances from the...Monroe Linden
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-12EXT-2434 update avatar rendering costNyx (Neal Orman)
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-10FIX DEV-41991: do not allow media settings panel to come up if media data is ...Rick Pasetto
2009-11-10Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-09PARTIAL FIX (workaround) DEV-41949: LLMediaEntry::setWhitelist() and LLMediaE...Rick Pasetto
2009-11-09Fix for DEV-42029 (changing media on multiple faces can make a zombie SLPlugin).Monroe Linden
2009-11-09Fix signed/unsigned build breakage in llvovolume.cppJames Cook
2009-11-09Better fix for DEV-42153.Monroe Linden
2009-11-06Partial fix for DEV-42153.Monroe Linden
2009-11-06mergeSteve Bennetts
2009-11-06merge from texture-pipelineSteve Bennetts