summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24increment viewer version to 3.7.5Oz Linden
2014-03-24merge changes for DRTVWR-360Oz Linden
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-14Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.Monty Brandenberg
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries and it had a bad library reference on Linux for release. In llaudio land, the audio engine interfaces, even the fmodex specializations, seem to want to be external-structure free so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION and deal with it in the ctor/dtor.
2014-03-15Made location checkbox automatically unchecked when caption is empty for ↵Cho
ACME-1375
2014-03-14Update fmodex to 4.44.31. Move DSP descriptor to heap storage.Monty Brandenberg
2014-03-14Made location checkbox disabled when caption is empty for ACME-1375Cho
2014-03-12Omit Flickr machine tags for parcel if unnamedCho
2014-03-10Merge. Refresh from viewer-release after 3.7.3 release.Monty Brandenberg
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-10MAINT-3703 Suspected thread race crasher in fmodex libraryMonty Brandenberg
Two problems found in DLL involving threads. First, DllMain was reinitializing a critical section for all entry reasons (process attach, detach and thread attach, detach). Should only be done on process attach. Second, static container object was being modified and accessed without serialization. Added some double-check locking to the initialization path to reduce the total number of serialization calls made while making the code thread safe.
2014-03-06Updated hard links for ACME-1306Cho
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
2014-02-27Pull merge of codesign workaroundMerov Linden
2014-02-27Merge JJ's viewer-release-codesign-workaroundsimon
2014-02-27Pull merge from viewer-acmeMerov Linden
2014-02-27ACME-1327 : Implemented preview in all SL Share panels, switch ownership of ↵Merov Linden
preview to focused SL Share photo panel
2014-02-26ACME-1327 : WIP : Make rescale of preview isotropic, make preview button a ↵Merov Linden
toggle
2014-02-26Fix linux build - make default check in switch statementSimon Linden
2014-02-26Changed SLShare photo upload filename to Untitled for the sake of default ↵Cho
Flickr title
2014-02-26Merged lindenlab/viewer-release into defaultJames Johnson
2014-02-26MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoidsimon
about the return type for calls to LLView::getParent(): never assume a down cast is possible.
2014-02-26ACME-1327 : WIP : Update the big preview with size and refresh as wellMerov Linden
2014-02-25ACME-1327 : WIP : Added computation of the big preview, allow big preview to ↵Merov Linden
be resizable
2014-02-25ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses the ↵Merov Linden
thumbnail for the moment
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-26Added machine tags to Flickr uploads for ACME-1323Cho
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-21Added Friends tab to Facebook floater for ACME-1325Cho
2014-02-20[MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the ↵Baker Linden
cause of the crash