summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-01-04MAINT-5978: Disable state machine, turn running of vivox over to the coroutine.Rider Linden
2016-01-04possible linux build fixBrad Payne (Vir Linden)
2016-01-04possible linux build fixBrad Payne (Vir Linden)
2016-01-04MAINT-489 various cache and log files not being deletedandreykproductengine
2016-01-04possible linux build fixBrad Payne (Vir Linden)
2016-01-04possible fix for linux build failureBrad Payne (Vir Linden)
2016-01-04SL-301 FIX - typo in avatar_lad.xmlBrad Payne (Vir Linden)
2016-01-04possible fix for linux build failureBrad Payne (Vir Linden)
2015-12-30MAINT-1338 FIXED Slider marker is out of slider after reopening PreferenceMnikolenko ProductEngine
2015-12-29MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0andreykproductengine
2015-12-23MAINT-1401 FIXED Pressing 'Cancel' button in 'Color picker' dialog changes ↵Mnikolenko ProductEngine
color of prim to the previous
2015-12-22MAINT-5976: Removed temp code to simulate Nat's fix. Now redundant.Rider Linden
2015-12-22Merge viewer-bearAndreyL ProductEngine
2015-12-22Merged lindenlab/viewer-bear into defaultAndrey Lihatskiy
2015-12-22MergeAndreyL ProductEngine
2015-12-22Merge downstream, version 4.0.1AndreyL ProductEngine
2015-12-21Merged in nat_linden/viewer-azumarill-vivox (pull request #2)Rider Linden
MAINT-5976: Fix bug in LLCoros::set_consuming() mechanism.
2015-12-21CMake fixes for Linux buildRider Linden
2015-12-21MAINT-335 FIXED Avatar hangs in space after cancelling teleportandreykproductengine
2015-12-21Merged lindenlab/viewer-lion into defaultRuslan Teliuk
2015-12-21MAINT-1017 FIXED Disable checkbox during saving process to avoid glitch.Mnikolenko ProductEngine
2015-12-18And more linux linkingRider Linden
2015-12-18Automated merge with ssh://bitbucket.org/rider_linden/azumarill-vivoxNat Goodspeed
2015-12-18MAINT-5976: Fix bug in LLCoros::set_consuming() mechanism.Nat Goodspeed
The original implementation of set_consuming() involved a bool* pointing to a local bool in VoidListener::operator()()'s stack frame. postAndSuspend() would set that bool (through the pointer) as soon as it returned from suspension. The trouble with that is that LLEventMailDrop potentially calls its new listener (fulfilling the future) immediately in the listen_impl() override -- in other words, way up at the top of postAndSuspend(), well before the code that sets the relevant bool. Instead, make the adapter formerly known as VoidListener bind the coroutine's get_consuming() value at adapter construction time (before listening on the LLEventPump), so that its operator()() has the coroutine's correct get_consuming() value to return. Eliminating the bool* makes the code both simpler AND more correct! This change makes that adapter very specific to coroutine usage. Rename it FutureListener and migrate it from lleventcoros.h into the .cpp file. Nobody else was using it anyway. Make corresponding changes to postAndSuspend2() and its WaitForEventOnHelper class -- whose name no longer corresponds to the function as it used to. Rename that one FutureListener2. The new FutureListener functionality, common to both these adapters, makes it useful to derive FutureListener2 from FutureListener. Introduce llmake(), a generic function to deduce template type arguments from function parameter types. This allows us to remove the voidlistener() and wfeoh() helper functions. Hiding VoidListener broke one of the lleventcoro_test.cpp tests. But that test was sort of a lame recap of an earlier implementation of postAndSuspend(), based on LLEventPump events. Recast that test to illustrate how to use a coroutine future to suspend a coroutine for something other than an LLEventPump. But that rubbed my nose in the fact that we MUST wrap future's context switching with proper management of the current coroutine. Introduce LLCoros::Future<T>, which wraps boost::dcoroutines::future<T>. Use LLCoros::Future<T> in postAndSuspend() and postAndSuspend2().
2015-12-18Another rt link for linuxRider Linden
2015-12-18MergeRider Linden
2015-12-18Disable unit test on Linux onlyRider Linden
2015-12-18mergeBrad Payne (Vir Linden)
2015-12-18MergeRider Linden
2015-12-18More rt libRider Linden
2015-12-18Adding RT to another cmake file for LinuxRider Linden
2015-12-18Reorder the rt library for Linux buildRider Linden
2015-12-18increment viewer version to 4.0.1Oz Linden
2015-12-17MAINT-5977: Update cmake file to always include boost with LLCommonRider Linden
2015-12-17MAINT-5977: Check get_consuming() as well as listener return when draining ↵Rider Linden
queue.
2015-12-17MAINT-5977: Finish implementation of MailBox event pump type for guaranteed ↵Rider Linden
delivery
2015-12-17Mergerider
2015-12-17MAINT-5976: Adding MailDrop type event Queuerider
2015-12-17MAINT-5971 FIXED Creator and Owner are missing in Object profileMnikolenko ProductEngine
2015-12-16merge with headcallum_linden
2015-12-16maint-5875 fix llceflib_host.exe' error about missing MSVCP120.dllcallum_linden
2015-12-16MAINT-5976: Introduce LLCoros::set_consuming(bool).Nat Goodspeed
set_consuming(true) tells each postAndSuspend() call to consume the event for which it is suspending.
2015-12-16MAINT-906 expiration time gets zeroesandreykproductengine
2015-12-16MAINT-2215 Estate tools Apply button remains available after it is clicked.Mnikolenko ProductEngine
2015-12-15Fix for OS X and Linux - their compilers do not like missing entries in case ↵callum_linden
statement
2015-12-15MAINT-5966 - file download failures need feedbackcallum_linden
2015-12-15Throttle consecutive connect attempts.rider
2015-12-15SL-276, SL-277 - support for version 2.0 of avatar_skeleton.xml and ↵Brad Payne (Vir Linden)
avatar_lad.xml
2015-12-15SL-276, SL-124 - code and config file cleanup for BentoBrad Payne (Vir Linden)
2015-12-15MAINT-957 Double-click Auto-pilot activates for clicks on UI elements, HUDs, ↵Mnikolenko ProductEngine
some right-clicks