summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2020-09-01Merge branch 'SL-13834' into DRTVWR-513-maintAndrey Lihatskiy
2020-09-01SL-13834 - small correctionBrad Payne (Vir Linden)
2020-08-31SL-13834 - omit string-type controls from preference logsBrad Payne (Vir Linden)
2020-08-26SL-13834 - add preferences info to ViewerStats, only when exiting and ↵Brad Payne (Vir Linden)
different from default
2020-08-19SL-11898 Restored the code lost on mergeAndrey Lihatskiy
2020-08-18BuildfixAndrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-08-18Increment viewer version to 6.4.8Nat Goodspeed
following promotion of DRTVWR-501
2020-08-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-08-11SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorageAndrey Kleshchev
to reflect previous commit and use correct pool size
2020-08-10Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-08-10Increment viewer version to 6.4.7Nat Goodspeed
following promotion of DRTVWR-476
2020-08-06Revert "SL-11215: Add release notes URLs to update-related notifications."Andrey Kleshchev
This reverts commit bf999f2f84dd26844c60d682f563f982a55e8ee8 due to revert of updater, this will be moved to separate 'epic' instead
2020-08-06SL-13737 Crash when cleaning up uninitialized ndof deviceAndrey Kleshchev
2020-08-05Revert commit bbb16ff97c1dbafa21358dbee8ca686d3c30478e.Andrey Kleshchev
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
2020-08-05SL-13719 One more exit crash for asset storageAndrey Kleshchev
2020-08-05SL-13704 Move link generation into getReleaseNotes()Andrey Kleshchev
2020-08-05Merge branch 'DRTVWR-476' into DRTVWR-501-maintAndrey Lihatskiy
2020-07-31SL-13626 Fixed spelling errorAndrey Kleshchev
2020-07-30SL-13626 Fix asset storage coroutine shutdownAndrey Kleshchev
2020-07-30SL-13704 Release notes link not loading in ToolsUpdate2 releaseAndrey Kleshchev
2020-07-30Revert part of SL-11216 due to reverting VVMAndrey Kleshchev
This reverts commit 31d9930a0ff7da5a6312a8f47037052cd2d06bdb.
2020-07-29Merge branch 'DRTVWR-476' into DRTVWR-501-maintAndrey Kleshchev
2020-07-28SL-13634 Don't warn about convex decomposition issues if it's a stubAndrey Kleshchev
2020-07-28Nat's suggested improvement to LLThreadSafeQueue that takes account of queue ↵Callum Prentice
being empty as well as the status flag condition
2020-07-24SL-13679 Event pump DupListenerName crash at loginAndrey Kleshchev
2020-07-24no-op change to trigger rebuildBrad Payne (Vir Linden)
2020-07-23no-op change to force new DRTVWR-476 buildBrad Payne (Vir Linden)
2020-07-23SL-13648 FIXED Issue with group notice date sortingMnikolenko Productengine
2020-07-23SL-13642 Get rid of that ugly ignore -Wdelete-incompleteAndrey Lihatskiy
Get rid of that ugly '#pragma clang diagnostic ignored "-Wdelete-incomplete"' by making sure the delete always happens inside llview.cpp, where the type of LLView is known.
2020-07-22Mac buildfixAndrey Lihatskiy
2020-07-22Remove redundant LL_EXSTAT_ from enums.Nicky Dasmijn
2020-07-22Put hash for boost namespace properly into that by using namespace boostNicky Dasmijn
2020-07-22LLExtStat had been a S32, this wasn't right, as some of the constants lead ↵Nicky Dasmijn
to integer overflow: const LLExtStat LL_EXSTAT_RES_RESULT = 2L<<30; const LLExtStat LL_EXSTAT_VFS_RESULT = 3L<<30; This shifts into the sign bit and clang gets (rightfully) upset about this. LLExtStatus needs to be at least of type U32 to remedy this problem, but while at it it makes sense to turn it into what it is: An enum. Turning it into a class enum has the added benefit we get type safety for mostly free. Which incidentally turned up a problem right away: A call to removeAndCallbackPendingDownloads had status and extstatus reversed and thus was wrong.
2020-07-22There was an idiom to test with LL_DARWIN if the compiler used is clang. ↵Nicky Dasmijn
This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ (https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros)
2020-07-22Linux needs strcmp , include <string.h> so we get access to that function.Nicky Dasmijn
2020-07-21Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llerror.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-20Increment viewer version to 6.4.6Nat Goodspeed
following promotion of DRTVWR-476
2020-07-15SL-13612 Dedicated Avatar menu -- Revise toolbar button labelsMnikolenko Productengine
2020-07-15SL-5894 Fix llurlentry test buildingAndrey Kleshchev
2020-07-15SL-5894 #4 Organize device storage between sessionsAndrey Kleshchev
2020-07-15SL-5894 #3 WIP enumerate devices to flaoter, let floater set deviceAndrey Kleshchev
temp
2020-07-14Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4Brad Kittenbrink
2020-07-10SL-5894 #2 WIP Changes to display multiple joystick devicesAndrey Kleshchev
2020-07-10SL-5894 Changed joystick init to select device with apropriate manufacturer ↵Andrey Kleshchev
and type
2020-07-10Merged in SL-12090 (pull request #105)Andrey Lihatskiy
SL-12090 Initialize the joystick only when required * SL-12090 Initialize the joystick only when required Approved-by: Andrey Kleshchev
2020-07-09SL-13093 Add time info to the Date column in group noticesMnikolenko Productengine
2020-07-09SL-13579 Parcel media cannot be played if Media auto-play is set to No.Andrey Kleshchev
2020-07-08SL-13479 Avatar menu tweaksMnikolenko Productengine
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-18 02:52:55 +0000