summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
AgeCommit message (Expand)Author
2010-08-25mergeDave Parks
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
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-02Redo the same merge as in changeset "2026f824953f", but this time with feeeel...Christian Goetze (CG)
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 b...Sergei Litovchuk
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 a...Sergei Litovchuk
2010-07-01EXT-5403 FIXED Removed marking filter applied to inventory panel as default t...Sergei Litovchuk
2010-06-30EXT-7827 FIXED (Search floater with capital characters in search field opens ...Andrew Polunin
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 me...Dave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-05-27EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
2010-05-21EXT-7439 FIXED reduce size of avatar textures floaterLoren Shih
2010-05-18AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statisticsLoren Shih
2010-05-18automated mergeLoren Shih
2010-05-17EXT-7385 FIXED Show load and discard level for loading texturesLoren Shih
2010-05-17EXT-7045 FIX miss one more texture setup place.Yuri Chebotarev
2010-03-31merge from viewer-trunkTofu Linden
2010-03-30EXT-3414 : Move static backgroundfetch methods and variables to llinventorymo...Loren Shih
2010-01-22Merge from v2 trunk.Tofu Linden
2010-01-22Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from Invento...Vadim Savchuk
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 Pick...Vadim Savchuk
2010-01-15fix for normal EXT-3997 IM and Profile pictures never fully rez, or are too-l...Ychebotarev ProductEngine
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
2009-12-22fixed minor bug EXT-3627 'Loading..' is shown over second life icon in view p...Andrew Polunin
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-13Header file cleanupLoren Shih
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
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-02Merge conflict resolution for previous commit.Loren Shih
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-29EXT-1352 Add image art to floater backgrounds.James Cook
2009-10-08EXT-1325 Texture Picker does not openLeyla Farazha