summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-07Merged in SL-13297 (pull request #820)Howard Stearns
SL-13297 Show both voice versions Approved-by: Andrey Kleshchev Approved-by: Andrey Lihatskiy
2022-01-06SL-13297 - fix a strange no-op merge conflictHoward Stearns
2022-01-06SL-13297 - Change names to match coding standard.Howard Stearns
2022-01-06SL-13297 - Update autobuild.xml for new 3p-slvoice dependency following ↵Howard Stearns
commit message changes there.
2022-01-06SL-13297 - bad copypastaHoward Stearns
2022-01-06SL-13297 - Use new teamcity slvoice.Howard Stearns
2022-01-06SL-13297 - Record and use build version reported by SLVoiceHoward Stearns
2022-01-06SL-13297 - Get rid of new lllicenseinfo. We do not need it.Howard Stearns
2022-01-06SL-13297 - Show both server/voice versions only if mismatched. Otherwise ↵Howard Stearns
show the longer one.
2022-01-06SL-13297 - Create LLLicenseInfo and use it in LLAppViewer::getViewerInfo and ↵Howard Stearns
LLFloaterAbout::postBuild.
2022-01-06SL-16604 Double click teleport should ignore clicking own nametagAndrey Kleshchev
2022-01-06SL-16604 Double click teleport should ignore clicking yourselfAndrey Kleshchev
2022-01-05bad copypastaHoward Stearns
2022-01-05Use new teamcity slvoice.Howard Stearns
2022-01-05DRTVWR-550 oops, more correct formatting for branch viewer_channel variable ↵Brad Kittenbrink
naming.
2022-01-06SL-16593 Viewer login gets stuck requesting capsAndrey Kleshchev
Error happens before viewer enters STATE_SEED_GRANTED_WAIT, so couldn't bypass straight to STATE_SEED_CAP_GRANTED and had to implement an error state. But in this case might be better to fail login immediately.
2022-01-05DRTVWR-550 correct formatting of branch variable name for viewer_channelBrad Kittenbrink
2022-01-04DRTVWR-550 setting viewer channel name for project buildBrad Kittenbrink
2021-12-30Record and use build version reported by SLVoiceHoward Stearns
2021-12-30Get rid of new lllicenseinfo. We do not need it.Howard Stearns
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-25Merge master into DRTVWR-486Andrey Kleshchev
2021-12-22Show both server/voice versions only if mismatched. Otherwise show the ↵Howard Stearns
longer one.
2021-12-22Create LLLicenseInfo and use it in LLAppViewer::getViewerInfo and ↵Howard Stearns
LLFloaterAbout::postBuild.
2021-12-21SL-16535 FIXED The Search floater opens without appropriate search results ↵Mnikolenko Productengine
after performing a search from the NavBar
2021-12-20SL-16297 Init mObscureMOAP flagMnikolenko Productengine
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-19SL-16564 'Click to' action 'None' doesn't work as intendedAndrey Kleshchev
There shouldn't be any differences for 'None' between normal objects and attachments
2021-12-18SL-16517 Dragging a physic object #2Andrey Kleshchev
mLastMouseX/Y might need to be assigned from gViewerWindow->getCurrentMouseX();
2021-12-17Merged in SL-16492 (pull request #818)Michael Pohoreski
SL-16492: Fix for HAS_ALPHA_MASK permutation not being set for fullbrightF.glsl when rigged mesh has alpha mask. Approved-by: Dave Parks
2021-12-17SL-16492: Fix for HAS_ALPHA_MASK permutation not being set for ↵Ptolemy
fullbrightF.glsl when rigged mesh has alpha mask.
2021-12-17SL-16517 Dragging a physic object momentarily moves it to an incorrect location.Andrey Kleshchev
2021-12-17SL-16297 Support the parcel obscure_moap flag.Mnikolenko Productengine
2021-12-17Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into ↵Runitai Linden
DRTVWR-546
2021-12-17SL-16478 Fix for octree and render batch debug display not working with ↵Runitai Linden
rigged meshes.
2021-12-17SL-16454 FIXED Performance viewer login screen is blackMnikolenko Productengine
2021-12-16DRTVWR-546 fix sUseFBO merge errorsDave Houlton
2021-12-16DRTVWR-546 fix dead setting merge errorDave Houlton
2021-12-16DRTVWR-546 remove dead fxn that breaks Mac buildDave Houlton
2021-12-15Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfaBrad Kittenbrink
2021-12-15SL-16388 Improvements to llfloatermfa.cpp from code reviewBrad Kittenbrink
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15Merged in SL-16493 (pull request #812)Michael Pohoreski
SL-16493: Fix non-fullbright partial alpha objects not being lit by sun broken in 511de439a3 Approved-by: Euclid Linden Approved-by: Dave Parks
2021-12-15Merged DRTVWR-546 into SL-16493Michael Pohoreski
2021-12-15Merged in DV546-merge-6.5.2 (pull request #814)Euclid Linden
DRTVWR-546 merge up to 6.5.2
2021-12-15SL-16493: Add comment about using deferred shaders even though we are in a ↵Ptolemy
post deferred state (forward pass rendering for transparency)
2021-12-16SL-16532 Crash at dragConstrainedAndrey Kleshchev
2021-12-15Merge updated branch 'DRTVWR-546' into DV546-merge-6.5.2Dave Houlton