summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24Merged in viewer-release.Aura Linden
2014-03-24increment viewer version to 3.7.5Oz Linden
2014-03-24merge changes for DRTVWR-360Oz Linden
2014-03-24Pulled merge from release.Aura Linden
2014-03-21DD-16 : WIP : More code on sort/show menu but still not actionable.Merov Linden
2014-03-20DD-16 : WIP : Update sort / show menu, not actionable yet thoughMerov Linden
2014-03-20DD-50 : Add the filtering code for marketplace prefiltered tabsMerov Linden
2014-03-20Returned Secondlife.log to main directory due to unforeseen LLErrorThread ↵Aura Linden
complexities.
2014-03-20DD-50 : Adding new filter code for marketplace filtered tabs (active, ↵Merov Linden
unactive and unassociated)
2014-03-19DD-10 : WIP : Added embryonic tool strip at the top of the marketplace floaterMerov Linden
2014-03-18DD-50 : Tabs added to the marketplace, fixed XUI, sorting not implemented yetMerov Linden
2014-03-18DD-50 : WIP : Add tabs to the marketplace listing UIMerov Linden
2014-03-18DD-40 : WIP : Got rid o the useless Drop Target text (not part of that UI)Merov Linden
2014-03-18DD-17, DD-40 : Style active listings in bold, implement a working ↵Merov Linden
initialization indicator
2014-03-17ACME-1376 : Take the location checkbox out of the photo panelMerov Linden
2014-03-15Mac Debug build is functional with this manifest changeMonty Brandenberg
2014-03-14DD-17 : WIP : Add live status to active listing folders, clean up ↵Merov Linden
getLabelSuffix() code a bit
2014-03-14DD-2 : Clean up LLMarketplaceData definitionMerov Linden
2014-03-14DD-43, DD-44 : implement update_marketplace_category() and get it called ↵Merov Linden
swhen appropriate
2014-03-13DD-42 : Rename merchant items to marketplace listings to be consistent with specMerov Linden
2014-03-13Merged in viewer-releaseAura Linden
2014-03-10DD-17 : WIP : some work on the suffix for Listing foldersMerov Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10DD-3 : WIP : Add test data to LLMarketplaceData when opening the floater for ↵Merov Linden
the first time
2014-03-10increment viewer version to 3.7.4Oz Linden
2014-03-07Fixes for crash reporter startup race condition, crash reporter CPU use, ↵Aura Linden
Secondlife.log filehandle, XP Crash.
2014-03-07DD-2 : Implement LLMarketplaceTuple and LLMarketplaceDataMerov Linden
2014-03-06DD-7 : Initialize the Merchant Items floater checking the is a Merchant ↵Merov Linden
status correctly. No indication it's initializing (UI) but the code works
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-03-03[MAINT-3555][MAINT-3703]Baker Linden
- Removed logging for MAINT-3555 - Added NULL guard to fix MAINT-3703 (hopefully)
2014-02-27Pull merge of codesign workaroundMerov Linden
2014-02-27Merge JJ's viewer-release-codesign-workaroundsimon
2014-02-26Merged lindenlab/viewer-release into defaultJames Johnson
2014-02-25Merge viewer-releasesimon
2014-02-25[MAINT-3784] - Viewer takes too long to shut downBaker Linden
- Removed a lot of logging code to reduce application close time
2014-02-24Pulled from release.obscurestar
2014-02-24Pull merge from viewer-releaseMerov Linden
2014-02-24increment viewer version to 3.7.3Oz Linden
2014-02-21changed variable names and errors to more accurately reflect the operation ↵JJ Linden
being performed
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash
2014-02-19duplicated the workaround added for darwin codesigning onto the windos ↵JJ Linden
codesigning
2014-02-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-02-14Merge. Refresh from viewer-release after 3.7.1 release.Monty Brandenberg
2014-02-14increment viewer version to 3.7.2Oz Linden
2014-02-11Merge. Refresh from viewer-release after 3.7.0 releaseMonty Brandenberg
2014-02-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-02-11Hack to fix ACME-1317Cho
2014-02-10increment viewer version to 3.7.1Oz Linden