summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Collapse)Author
2010-12-07Automated merge up from viewer-developmentLoren Shih
2010-12-01STORM-677 ADDITIONAL_FIX Force textures inside texture picker to be 100% ↵Vadim ProductEngine
opaque while the control is in a focused floater. Besides, made LLFloater handle opacity more like other controls do.
2010-11-25STORM-677 FIXED Made texture picker control transparent if the floater it ↵Vadim ProductEngine
resides in is transparent. Also added transparency support to the texture picker floater.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-27mergeDave Parks
2010-09-22Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching ↵Dave Parks
type back into tools floater.
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-08DEV-53094 FIX Selecting texture picker causes viewer to crashRichard Nelson
overzealous elimination of xml parsing
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-25mergeDave Parks
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
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-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-22EXT-5403 FIXED texture picker to scroll to selected texture initially after ↵Sergei Litovchuk
being open. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/736/. --HG-- branch : product-engine
2010-07-30mergeRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-30mergeRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-14mergeDave Parks
2010-07-12EXT-5403 FIXED Disabled auto selecting first filtered item because it takes ↵Sergei Litovchuk
away selection from the item set by LLTextureCtrl owning the texture picker floater. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/679/. --HG-- branch : product-engine
2010-07-01EXT-5403 FIXED Removed marking filter applied to inventory panel as default ↵Sergei Litovchuk
to fix scrolling to currently selected texture. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/679/. --HG-- branch : product-engine
2010-06-30EXT-7827 FIXED (Search floater with capital characters in search field opens ↵Andrew Polunin
from 'Pick: Texture' floater) Changed 'upper_case_search_string' to the 'search_string' Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/674/ --HG-- branch : product-engine
2010-06-24EXT-7046 FIX User profile using wrong placeholder/generic profile pic artRichard Linden
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-06-07Merge with render-pipelineDave Parks
2010-05-27EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
EXT-7526 FIXED Add baked texture information to texture view First attempt at low res textures after timeout. Added debug setting to control whether low res texture timeout is used. Added baked texture load information to texture view debug display. Trivial name changes to some variables.
2010-05-21EXT-7439 FIXED reduce size of avatar textures floaterLoren Shih
Texture elements are now smaller so the floater doesn't consume the entire viewer window space.
2010-05-18AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statisticsLoren Shih
Fixed memory leak. Prettied up formatting for debug readouts. Added more notifications for rez and cloud time.
2010-05-18automated mergeLoren Shih
2010-05-17EXT-7385 FIXED Show load and discard level for loading texturesLoren Shih
More debugging information is now shown for loading textures
2010-05-17EXT-7045 FIX miss one more texture setup place.Yuri Chebotarev
Also remove redundant variable and do some refactoring. Reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/391/ --HG-- branch : product-engine
2010-03-31merge from viewer-trunkTofu Linden
2010-03-30EXT-3414 : Move static backgroundfetch methods and variables to ↵Loren Shih
llinventorymodel subclass Created LLInventoryModelBackgroundFetch file for handling background fetch.
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-22Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from ↵Vadim Savchuk
Inventory floater doesn't trigger "save" button to become active). Modified LLTextureCtrl's no_commit_on_selection paramater behavior so that the widget gets dirty only on DnD or when the OK button is pressed in the picker. This is needed for panels that rely on LLTextureCtrl::isDirty() to enable their "Apply" button. --HG-- branch : product-engine
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-20Fixed bug EXT-4369 ([BSI] Changing image in "Pick" doesn't trigger "Save ↵Vadim Savchuk
Pick" button to be active) * Changed the Save button to react on texture picker commit, not on selection. * Added an optional "no_commit_on_selection" parameter to LLTextureCtrl to commit only when user presses the OK button in the picker or changes the texture via DnD, i.e. browsing in the picker doesn't commit. --HG-- branch : product-engine
2010-01-15fix for normal EXT-3997 IM and Profile pictures never fully rez, or are ↵Ychebotarev ProductEngine
too-low resolution no idea why this(...a bit different set of flags and forceToSaveRawImage(0)...) do the job...just copy/past from LLPreviewTexture. --HG-- branch : product-engine
2010-01-13Merge.Tofu Linden
2010-01-08EXT-3091 [BSI] Loading Texture Text in Build doesn't fitLeyla Farazha
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-22fixed minor bug EXT-3627 'Loading..' is shown over second life icon in view ↵Andrew Polunin
profile panel --HG-- branch : product-engine
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-13Header file cleanupLoren Shih
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel. --HG-- branch : avatar-pipeline
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 06:42:53 +0000