summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2014-04-25Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-21DD-66 : Use new icons for version folders and stock folderMerov Linden
2014-04-15Merges in fix for Maint-5707Aura Linden
2014-04-14Fix for MAINT-5707 bad breakpad behavior with teleport linksAura Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-28DD-24 : Add FT_MARKETPLACE_STOCK as a new type for folders, implement the ↵Merov Linden
promotion code for Drag and Drop, display of stock folders and embryonic marketplace validation
2014-03-25Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-13DD-42 : Rename merchant items to marketplace listings to be consistent with specMerov Linden
2014-03-13Probable fix for linux hang.Aura Linden
2014-03-13Merged in viewer-releaseAura Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-07Fixes for crash reporter startup race condition, crash reporter CPU use, ↵Aura Linden
Secondlife.log filehandle, XP Crash.
2014-03-06DD-4, DD-5, DD-6, DD-7, DD-8: WIP : Add Merchant Items panel and make it ↵Merov Linden
somewhat work, in a clunky sort of way
2014-03-04Pull merge from viewer-maint-2287 aka Merchant OutboxMerov Linden
2014-02-25Merge viewer-releasesimon
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-20Fix build problemmaksymsproductengine
2014-02-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- memory leaks fixing;
2014-02-14More memory cleanup of containers after DeletePairedPointer() usage.simon
2014-02-14[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdownBaker Linden
- Added clear() after DeletePointer() call to hopfully fix this...
2014-01-26typo. Yay.Aura Linden
2014-01-26Debug removal.Aura Linden
2014-01-26Merged.Aura Linden
2014-01-26Was not using correct name for results of file search.obscurestar
2014-01-23Debugging changes. fixed broken pipe.Aura Linden
2014-01-22Removed debug line.Aura Linden
2014-01-22char vs wchar_t FIGHTAura Linden
2014-01-21Heavy-handed attempt at fixing crashandloop hang.Aura Linden
2014-01-16What passess in MSVC may not pass in Teamcity.Aura Linden
2014-01-16Fixed syntax issue that was wrapped in #if that didn't get hit until we got ↵Aura Linden
to teamcity. oops.
2014-01-15Fixes from Windows build including utf-16 to utf-8 conversions.Aura Linden
2014-01-14Some cleanup of string to wstring conversion and vice versa.Aura Linden
2013-12-05Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.Monty Brandenberg
2013-12-04Removed debugging code.Aura Linden
2013-12-03Creating a cleaner branchAura Linden
2013-11-25Merge. Refresh from viewer-release after 3.6.11 release.Monty Brandenberg
2013-11-25Merge - doh!simon
2013-11-21Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18Pull merge from lindenlab/viewer-releaseMerov Linden
2013-11-18Code review updates. All comments so far.Monty Brandenberg
2013-11-12Merge. Refresh from viewer-release after 3.6.10 releaseMonty Brandenberg
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-06MAINT-3374 FIXED Don't show username after display name if this setting is ↵Mnikolenko ProductEngine
disabled.
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-14Pull merge with lindenlab/viewer-bearMerov Linden
2013-10-14Pull merge from lindenlab/viewer-releaseMerov Linden
2013-10-04Merge. Pull in viewer-release after 3.6.7 release.Monty Brandenberg
2013-10-03merge changes for 3.6.7-releaseOz Linden