summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.cpp
AgeCommit message (Collapse)Author
2011-05-02mergeDave Parks
2011-04-13EXP-669 : Refactor code to use correct LLImageFormatted methods to load ↵Merov Linden
images of all formats, reviewed by richard
2011-01-28SH-887 Upload model options available when MeshEnabled set to Falseleyla_linden
2011-01-26SH-842 Hide "Model" option in upload menuleyla_linden
2010-12-16Automated merge up from viewer-developmentLoren Shih
2010-12-14merge fix(es) for storm-378Oz Linden
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-10STORM-378 FIX REVERTED Backed out changeset: 1bce3dd882dfSeth ProductEngine
2010-12-08EXP-448 FIX Notification not found error for NofileExtension given when ↵Richard Linden
uploading file with no file extension during Bulk Upload
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-23STORM-378 FIXED Added playing snapshot animation and sound when snapshot ↵Seth ProductEngine
floater is open or refreshed and a snapshot is actually taken. Removed animation upon saving and sending a snapshot.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-06Fix for double uploads of non modelsjwolk
2010-09-28SH-238 Add check boxes to upload skin weights (or not) and/or joint ↵Dave Parks
positions (or not). Remove llfloaterimportcollada Reviewed by Prep.
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-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-14mergeDave Parks
2010-06-15merge fix in unrelated file.Tofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset 1c66b34b7fbeTofu Linden
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-06-08Merge cleanup.Dave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency' Reviewed by Sam/Richard
2010-05-11Hide mesh UI when MeshEnabled is set to false.Dave Parks
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-01make LLImageBase::allocateData() thread-safe.Xiaohong Bao
insert debug code for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-25automated mergeLoren Shih
2010-03-24MergeLeyla Farazha
2010-03-24Hooked up Save As Profile PicLeyla Farazha
reviewed by Richard CC# 167
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-20mergeDave Parks
2010-03-18(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)Sergei Litovchuk
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/ --HG-- branch : product-engine
2010-03-16Implemented normal task EXT-5982([HARD CODED] on L$ kaufen window (Buy L$)).Andrew Dyukov
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/33/ --HG-- branch : product-engine
2010-03-12Fix for file dialog crashing on mac and linux when uploading meshes.Dave Parks
2010-03-08little boolDave Parks
2010-03-08Multi-threaded file dialogDave Parks
2010-03-01"Model..." upload button always enabled now.Dave Parks
Default fast alpha to on.
2010-02-28Remove some dead code.Dave Parks
Add LH transform to LLVector3 Add DebugShowUploadCost Make LOD generation on model preview less finnicky. Remove error level based LOD generation. Better framing of model before upload. Better error handling for model uploader. Remove [COST] argument from model upload menu item. Remove L$ check from model upload menu item being enabled.
2010-02-11merge from viewer2 trunk.Tofu Linden
2010-02-11CIT-76Tofu Linden
Checker: FORWARD_NULL Function: upload_done_callback(const LLUUID &, void *, int, int) File: /indra/newview/llviewermenufile.cpp
2010-01-07Backed out changeset: 0e0f8b0b0fa8Dave Parks
2010-01-06LLImportCollada no longer a singleton to prepare for subclassing.Dave Parks
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-17dos2unix line ending fix for llviewermenufile.cppLoren Shih
--HG-- branch : avatar-pipeline
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