summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2017-02-13Automated merge with lindenlab/viewer64callum@lindenlab.com
2017-02-13DRTVWR-418: Reluctantly skip llcorehttp 503-with-retry test on W64.Nat Goodspeed
2017-02-13Automated merge with head of callum_linden/viewer64-xcode8callum@lindenlab.com
2017-02-13Automated merge with head of callum_linden/viewer64-callumcallum@lindenlab.com
2017-02-13MAINT-6999 Cap attachment render weightandreykproductengine
2017-02-10Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-02-09MAINT-7095 Fixed Detached and reduced nearby chat floater does not maintain ↵andreykproductengine
its position through viewer restart.
2017-02-07MAINT-7112 FIXED URI namespace /completename is still affected by the ↵Mnikolenko Productengine
Usernames viewer setting.
2017-02-06MAINT-2001 Fixes colums misbeheavingandreykproductengine
2017-02-04DRTVWR-418: Merge from v-r makes llmath tests need Boost.Thread.Nat Goodspeed
2017-02-04DRTVWR-418: Finish cleaning up merge from viewer-release.Nat Goodspeed
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-02-03Change destination location of updated VLC files to correct onecallum@lindenlab.com
2017-02-03Automated merge with ssh://bitbucket.org/callum_linden/viewer64-xcode8Nat Goodspeed
2017-02-03DRTVWR-418: Remove most (all?) of the "stubs" from llurlentry_test.Nat Goodspeed
At some point the INTEGRATION_TEST_llurlentry build changed so that the library(ies) we attempted to stub out got linked in anyway, so that instead of simplifying the test, the stubs broke it with "duplicate symbol" errors. Commenting out the stubs permits the test program to succeed.
2017-02-03MAINT-6959: Use localized category namesAnsariel Hiller
2017-02-03Merged in lindenlab/viewer-bearAndreyL ProductEngine
2017-02-03MAINT-2438 Fixes wrong permissions sourceandreykproductengine
2017-02-03Automated merge with head of lindenlab/nat_viewer64callum@lindenlab.com
2017-02-03DRTVWR-418: Eliminate llui reference to newview's gSavedSettings.Nat Goodspeed
Instead, since gSavedSettings is an LLControlGroup and LLControlGroup derives from LLInstanceTracker, just look up the LLControlGroup with canonical name.
2017-02-03DRTVWR-418: INTEGRATION_TEST_llurlentry depends on Hunspell.Nat Goodspeed
2017-02-03DRTVWR-418: Make operator()() method for comparator functor const.Nat Goodspeed
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-02-03MAINT-7103 New URI namespace /legacynameMnikolenko Productengine
2017-02-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-02-02increment viewer version to 5.0.2Oz Linden
2017-02-02MAINT-288 Fixed Content of 'Object contents' tab blinks after editing it's ↵andreykproductengine
permissions
2017-02-01MAINT-7099 FIXED 'IM' and 'Voice call' menu items should be disabled for the ↵Mnikolenko Productengine
group, which you have already left
2017-02-01MAINT-7096 FIXED The last item on the block list cannot be readMnikolenko Productengine
2017-02-01MAINT-725 Script debug floater functionality is borked, rendering it ↵Mnikolenko Productengine
completely useless for scripters
2017-01-31MAINT-7094 Fixed Adjust messages in the viewer for new xml tagsandreykproductengine
2017-01-30Automated merge with head of lindenlab/nat_viewer64Callum Linden
2017-01-30MAINT-3216 Fixed "Vertical scale" does not change "Repeats per meter" on "Tab"andreykproductengine
2017-01-31MAINT-7084 Add tally and limit values to Block list.Mnikolenko Productengine
2017-01-30DRTVWR-418: Merge from oz_viewer64Nat Goodspeed
2017-01-30MAINT-6959 Dummy callback to prevent log spamandreykproductengine
2017-01-28Merged in MAINT-86Andrey Kleshchev
2017-01-27First batch of changes to add LibVLC media plugin to macOS viewer. Plugin ↵Callum Linden
fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes
2017-01-27MAINT-7061 Better checkAndreyL ProductEngine
2017-01-27MergeRider Linden
2017-01-27MAINT-86 Fixed object-contents aren't updated after wearing from groundandreykproductengine
2017-01-26MAINT-7082: Clean up, remove log spam.Rider Linden
2017-01-26MAINT-7082: max_idle_time unused.Rider Linden
2017-01-26MAINT-6959 swapping line edits with text boxes in preferences tabandreykproductengine
2017-01-25MAINT-7082: Remove waiting loop in frame when textures queued for download ↵Rider Linden
in alternate thread. With debug spam for observation.
2017-01-25MergeRider Linden
2017-01-19First set of changes to build (tests off) to build correctly against Xcode 8 ↵Callum Linden
and SDK 10.12
2017-01-17MAINT-6959 Ability to set custom folders for uploading itemsandreykproductengine
2017-01-26Merged in MAINT-309Andrey Kleshchev
2017-01-26MAINT-7061 Make the check TPV friendlyAndreyL ProductEngine