summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-05-06increment viewer version to 3.7.8Oz Linden
2014-04-22Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-22MergeXiaohong Bao
2014-04-21increment viewer version to 3.7.7Oz 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-07merge with releaseRichard Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07increment viewer version to 3.7.6Oz Linden
2014-03-26Double init of logging probably due to merge fail.Aura Linden
2014-03-26Not ideal but sufficient.Aura Linden
2014-03-25Still wasn't doing the right thing with log files.Aura Linden
2014-03-24The simple approach has not worked. This hybrid solution should avoid the ↵Aura Linden
Windows issues and get us per-run logfiles.
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24merge with releaseRichard 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-20Returned Secondlife.log to main directory due to unforeseen LLErrorThread ↵Aura Linden
complexities.
2014-03-17ACME-1376 : Suppress location checkbox in Facebook Photo panelMerov Linden
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-15Made location checkbox automatically unchecked when caption is empty for ↵Cho
ACME-1375
2014-03-14Made location checkbox disabled when caption is empty for ACME-1375Cho
2014-03-13Merged in viewer-releaseAura Linden
2014-03-12Omit Flickr machine tags for parcel if unnamedCho
2014-03-12merge with releaseRichard Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10MAINT-3555 : Consitency fix after merge of changeset f269634 in viewer-acmeMerov Linden
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
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-06Updated hard links for ACME-1306Cho
2014-03-05balance the Object cache trees to delete empty nodes to save memory.Xiaohong Bao
2014-03-04Merge pull from lindenlab/viewer-acmeMerov Linden
2014-03-04ACME-1343 : Reset the siz eof the preview texture to be the same as the ↵Merov Linden
saved snapshot
2014-03-04ACME-1342 : Fix wrong type when getting friends_accordion in resourcesMerov Linden
2014-03-03[MAINT-3555][MAINT-3703]Baker Linden
- Removed logging for MAINT-3555 - Added NULL guard to fix MAINT-3703 (hopefully)
2014-03-03ACME-1336 : Fix message when FB friends list is emptyMerov Linden
2014-03-02ACME-1335, ACME-1336 : Add callbacks to FB events so to update the FB friend ↵Merov Linden
lists in a timely manner
2014-02-28ACME-1335, ACME-1336 : Add info text to the Friends tab in Facebook when no ↵Merov Linden
friends are visible
2014-02-28ACME-1332 : Update the friends lists in the FB Friends panel when friend ↵Merov Linden
status (add/remove) changes
2014-02-28Made lists only visible when populated in Friends tab in Facebook floater ↵Cho
for ACME-1334
2014-02-28Added FB+SL friends list to Friends tab in Facebook floater for ACME-1334Cho
2014-02-27Pull merge from viewer-acmeMerov Linden
2014-02-27ACME-1333 : Allow Facebook panel to be resized, fixed ensuing follow ↵Merov Linden
positioning issues in all subpanels