summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-02-04Merged with viewer-dev-materialsKitty Barnett
2013-02-04Material PUT queue entries aren't removed after a request is sentKitty Barnett
2013-02-02Merged callum_linden/viewer-development-usb-headset into defaultDrake Arconis
2013-02-02Updated fmodex download paths / md5sums from proxy for the first TC buildsGraham Madarasz (Graham Linden)
2013-02-01mergeGilbert Gonzales
2013-02-01CHUI-691: Now when an estate message is received while in DND mode, a toast ↵Gilbert Gonzales
notification will appear.
2013-02-02mergingCho
2013-02-01SH-3800 WIP - additional log lineBrad Payne (Vir Linden)
2013-02-01SH-3800 WIP - additional log lineBrad Payne (Vir Linden)
2013-02-01CHUI-720 FIX User can open "Add friend" by pressing on a line in context ↵Cho
menu for user that already is friend Added check for getVisible() and getEnabled() before passing along handleMouseDown() and handleMouseUp() callbacks to other menu items in LLMenuItemSeparatorGL
2013-02-01SH-3800 WIP - fixed bad case in appearance version computationBrad Payne (Vir Linden)
2013-02-01mergeGilbert Gonzales
2013-02-01CHUI-689: When DND mode is enabled, making a direct delivery purchase ↵Gilbert Gonzales
results in an IM message from '(Nobody)'. Solution: Fixed a problem in process_improved_im that would falsy use system messages while in DND mode as an IM from a user. Also made it so that while in DND mode, SystemMessages and message with a high or greater priority are shown to the user as toasts (before a notification chiclet would just appear without the toast).
2013-02-01CHUI-675 FIX You can select multiple users in people floater but can only ↵Cho
drag and drop one name to conversation Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
2013-02-01Added copy of libfmodex .so for linuxGraham Madarasz (Graham)
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ↵callum_linden
up left
2013-02-01SH-3800 WIP - log some of sent appearance msg info as well as receivedBrad Payne (Vir Linden)
2013-02-01merge up to latest version from tonyaOz Linden
2013-02-01add debug logging, ostream support for material ids, and some minor cleanupOz Linden
2013-02-01SH-3800 WIP - reject appearance messages with contradictory appearance ↵Brad Payne (Vir Linden)
version info
2013-02-01CHUI-715 FIXED Disable Gear button if no conversation is selectedMnikolenko ProductEngine
2013-02-01STORM-1930 Quality & Speed slider has Ultra label where High should be.Whirly
2013-02-01mergingmberezhnoy
2013-01-31sync with viewer-developmenteli
2013-01-31make logging tag for Materials uniformOz Linden
2013-01-31Fixing VC++ compile error: calling a static routine doesn't need the "this" ↵Tonya Souther
pointer
2013-01-31Merging in main repository.Tonya Souther
2013-01-31Mergemaxim@mnikolenko
2013-01-31CHUI-719 FIXED Font color was changed.maxim@mnikolenko
2013-01-31mergeBrad Payne (Vir Linden)
2013-01-31Pull merge with lindenlab/viewer-chuiMerov Linden
2013-01-31merge workaround for llprocess test failuresOz Linden
2013-01-31workaround by skipping llprocess tests that frequently fail on WindowsOz Linden
2013-01-31merge workarounds for failing testsOz Linden
2013-01-31disable timing sensitive check in the pipe and pump fitness testOz Linden
2013-01-31disable timing sensitive check in the pipe and pump fitness testOz Linden
2013-01-31work around inexplicably failing unit testsOz Linden
2013-01-31skip some http core tests on Windows because they fail too frequentlyOz Linden
2013-01-31CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will ↵maxim@mnikolenko
also solve problem with chui-710.
2013-01-31CHUI-718 (User does not see own chat in conference IM)mberezhnoy
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
2013-01-31Control reorganization and bugfixes.Tonya Souther
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-31CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-30SH-3800 WIP - avoid complaints about source of various standard textures - ↵Brad Payne (Vir Linden)
IMG_DEFAULT_AVATAR etc
2013-01-30SH-3800 WIP - logic to detect baked textures being sought in the wrong ↵Brad Payne (Vir Linden)
place, avoid querying textures for which we have no authoritative data where they live
2013-01-30mergeNyx Linden
2013-01-30SH-3651 FIX Beards not visible on server-generated appearances.Nyx Linden
Fixed back end to enable beards.
2013-01-30Added tag 3.4.5-beta4 for changeset 1567de5700c2Oz Linden
2013-01-30mergingmberezhnoy
2013-01-30SH-3800 WIP - flag mismatched expectations for baked texture originsBrad Payne (Vir Linden)