summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
AgeCommit message (Collapse)Author
2010-02-10merge from viewer2 trunk.Tofu Linden
2010-02-09change some llassert_always to llassert in llviewertexture.cppXiaohong Bao
2010-02-09merge from viewer2.Tofu Linden
2010-02-09more fix for EXT-4352: texture problem in viewer 2.0. fixed texture priority ↵Xiaohong Bao
problem.
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-05EXT-4209 Fix for sculptie prims not updating geometry when texture is loaded.Dave Parks
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-375Tofu Linden
Checker: UNINIT_CTOR Function: LLViewerFetchedTexture::LLViewerFetchedTexture(const LLImageRaw *, int) File: /indra/newview/llviewertexture.cpp
2010-01-26Merge from viewer2 trunk.Tofu Linden
2010-01-25"Fix" confusion over media settingsRick Pasetto
Review #89 This implements the changes Sam wanted in order to reduce the confusion over media enabled-ness, in particular: - "Media Enabled" pref now only controls "AudioStreamingMedia" - No more "tentative" state - New "Music Enabled" pref - First run dialog controls Media and Music (Sam, this is a change from your request...I think it works better) - Put a reflection of the "Media Enabled" checkbox in the Nearby Media Floater - Get rid of the "AudioStreamingVideo" setting altogether (whatever used it, it should now obey "AudioStreamingMedia").
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-21Fix inverted logic from review.Tofu Linden
2010-01-21Turn on llassert() and llverify() for RelWithDebInfo builds.Tofu Linden
Convert top firing asserts into big warnings. To be reviewed by Mani.
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-15partial fix for EXT-4352: Texture loading problems in Viewer 2.0. More to ↵Xiaohong Bao
come later (next week).
2010-01-13Merge.Tofu Linden
2010-01-08Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-01-08fix for EXT-4094: Shared whiteboard script crashes viewer.Xiaohong Bao
2010-01-06Merge from viewer2 trunk again - some fairly important fixes there.Tofu Linden
2010-01-05DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many placesTofu Linden
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2009-12-29for DEV-44376: create a switch for texture decoding.Xiaohong Bao
2009-12-29fix for DEV-44134: trying to move away from a huge amount of objects with ↵Xiaohong Bao
media causes viewer to hang for 15-20 seconds.
2009-12-18Additional HTTP Texture tuniningSteve Bennetts
* Important fix in lltexturefetch.cpp where a 'partial' resonse was incorrectly setting mHaveAllData.
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-16Convert ll_face_list_t in llviewertexture to a std::set to improve ↵Dave Parks
performance on face deletion.
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-10fix for DEV-43870: EXT-3137: Crash when add quicktime media to multiple faces.Xiaohong Bao
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-16fix for DEV-2530: crash after teleporting to refion.Xiaohong Bao
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in the long run this will reduce build time. Also cleaned up a lot of header file usage to conform better to the coding standard. reviewed by james and steve.
2009-11-12do not apply additional decode priority to textures with high boost levels.Xiaohong Bao
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
2009-11-11use "LLViewerTexture::EBoostLevel" to replace "S32" for texture boost level.Xiaohong Bao
2009-11-06Fixed textrue prioritization so that boosted textures are always highest ↵Steve Bennetts
priority.
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
2009-11-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-11-01additional fix for DEV-41913: parcel media does not display on particle ↵Xiaohong Bao
textures.
2009-10-30fix DEV-41913: parcel media does not display on particle textures.Xiaohong Bao
2009-10-29fix EXT-1661: Avatars' icons should be cached only once per 24 hours, but ↵Xiaohong Bao
not every time the viewer is restarted. to be reviewed by steve.
2009-10-25* Changes to enable differentiating between icon texture priority and other ↵Steve Bennetts
UI texture priority. * Still need to only request smaller mip maps of icon textures
2009-10-20Fix for DEV-41572 (login screen image does not display).Monroe Linden
2009-10-12fix for EXT-1328: Alpha textures are not displayed correctly when first loaded.Xiaohong Bao
to be reviewed by davep.
2009-10-03fix for DEV-40559: viewer crash when media texture appears while parcel ↵Xiaohong Bao
media is loading.
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-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 13:31:37 +0000