Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Brad Payne (Vir Linden) 5310ddfafc possible fix for linux build failure 2016-01-04 08:52:46 -05:00
Mnikolenko ProductEngine 5d6935ef86 MAINT-1338 FIXED Slider marker is out of slider after reopening Preference 2015-12-30 15:54:45 +02:00
andreykproductengine c73d9e5c44 MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0 2015-12-29 20:20:40 +02:00
Mnikolenko ProductEngine 6901fea203 MAINT-1401 FIXED Pressing 'Cancel' button in 'Color picker' dialog changes color of prim to the previous 2015-12-23 15:18:18 +02:00
pavelkproductengine 5d576df190 MAINT-5194 Visual Outfit Browser
1)Added visual hilighting of worn outfit
2)Fixed colors  of selection borders to fit initial design
2015-12-22 20:27:19 +02:00
Rider Linden ae1c75c1c8 MAINT-5976: Removed temp code to simulate Nat's fix. Now redundant. 2015-12-22 10:17:44 -08:00
AndreyL ProductEngine 68e41999d5 Merge viewer-bear 2015-12-22 19:41:46 +02:00
Andrey Lihatskiy 579ed3849a Merged lindenlab/viewer-bear into default 2015-12-22 19:24:33 +02:00
AndreyL ProductEngine b095e2c985 Merge 2015-12-22 17:59:01 +02:00
AndreyL ProductEngine 60dfd55eda Merge downstream, version 4.0.1 2015-12-22 11:07:18 +02:00
Rider Linden c6fd58f0c4 Merged in nat_linden/viewer-azumarill-vivox (pull request #2)
MAINT-5976: Fix bug in LLCoros::set_consuming() mechanism.
2015-12-21 15:37:52 -08:00
Rider Linden 3edc3c5554 CMake fixes for Linux build 2015-12-21 14:26:41 -08:00
andreykproductengine 49fa9b5515 MAINT-335 FIXED Avatar hangs in space after cancelling teleport 2015-12-21 19:22:40 +02:00
Ruslan Teliuk 7ce37f9910 Merged lindenlab/viewer-lion into default 2015-12-21 18:21:05 +02:00
Mnikolenko ProductEngine 5099d01b74 MAINT-1017 FIXED Disable checkbox during saving process to avoid glitch. 2015-12-21 11:37:31 +02:00
Rider Linden 5ae4299291 And more linux linking 2015-12-18 15:56:07 -08:00
Nat Goodspeed a0a0288f6a Automated merge with ssh://bitbucket.org/rider_linden/azumarill-vivox 2015-12-18 18:06:52 -05:00
Nat Goodspeed 2ee22ed264 MAINT-5976: Fix bug in LLCoros::set_consuming() mechanism.
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-18 18:06:32 -05:00
Rider Linden 7900e2ee77 Another rt link for linux 2015-12-18 15:06:24 -08:00
Rider Linden 909e409743 Merge 2015-12-18 14:10:02 -08:00
Rider Linden b98469bd7d Disable unit test on Linux only 2015-12-18 13:53:03 -08:00
Brad Payne (Vir Linden) 3f81bb15b3 merge 2015-12-18 13:55:41 -05:00
Rider Linden 6dd80980cf Merge 2015-12-18 10:16:26 -08:00
Rider Linden 6fca0eaa00 More rt lib 2015-12-18 09:59:03 -08:00
Rider Linden 6b4151d895 Adding RT to another cmake file for Linux 2015-12-18 09:55:12 -08:00
pavelkproductengine 749bb57cd1 MAINT-5194 Visual Outfit Browser
Visual selection of outfit implemented
2015-12-18 19:20:32 +02:00
Rider Linden 9210dcb328 Reorder the rt library for Linux build 2015-12-18 08:52:39 -08:00
Oz Linden 4b7ff25eba merge changes for 4.0.0-release 2015-12-18 10:44:42 -05:00
Oz Linden 7b993d15b7 increment viewer version to 4.0.1 2015-12-18 06:30:19 -05:00
Oz Linden 142be5b062 Added tag 4.0.0-release for changeset ae3297cdd03a 2015-12-18 06:30:19 -05:00
Rider Linden 4e8edebe13 MAINT-5977: Update cmake file to always include boost with LLCommon 2015-12-17 17:12:11 -08:00
Rider Linden 6851dd30ca MAINT-5977: Check get_consuming() as well as listener return when draining queue. 2015-12-17 14:53:21 -08:00
Rider Linden 2c9097aa28 MAINT-5977: Finish implementation of MailBox event pump type for guaranteed delivery 2015-12-17 14:09:51 -08:00
rider db70768def Merge 2015-12-17 09:07:50 -08:00
rider 83c9c6df07 MAINT-5976: Adding MailDrop type event Queue 2015-12-17 09:06:19 -08:00
Mnikolenko ProductEngine 405bae78cd MAINT-5971 FIXED Creator and Owner are missing in Object profile 2015-12-17 12:30:19 +02:00
callum_linden 76e83ec00a merge with head 2015-12-16 18:09:51 -08:00
callum_linden dd3b3a4fca maint-5875 fix llceflib_host.exe' error about missing MSVCP120.dll 2015-12-16 18:09:30 -08:00
Glenn Glazer cc79b5663f MAINT-5974: change URL creation 2015-12-16 14:45:03 -08:00
Nat Goodspeed 6a062089b8 MAINT-5976: Introduce LLCoros::set_consuming(bool).
set_consuming(true) tells each postAndSuspend() call to consume the event for
which it is suspending.
2015-12-16 17:13:04 -05:00
andreykproductengine 6ffe5d7bd3 MAINT-906 expiration time gets zeroes 2015-12-16 18:50:50 +02:00
Mnikolenko ProductEngine 0e31f5cacc MAINT-2215 Estate tools Apply button remains available after it is clicked. 2015-12-16 14:05:21 +02:00
callum_linden e07c2f8491 Fix for OS X and Linux - their compilers do not like missing entries in case statement 2015-12-15 16:34:06 -08:00
callum_linden 3bf8929d93 MAINT-5966 - file download failures need feedback 2015-12-15 15:24:41 -08:00
rider f4b6a89ab0 Throttle consecutive connect attempts. 2015-12-15 11:13:47 -08:00
Brad Payne (Vir Linden) 99f4b27020 SL-276, SL-277 - support for version 2.0 of avatar_skeleton.xml and avatar_lad.xml 2015-12-15 08:11:56 -05:00
Brad Payne (Vir Linden) 84f524e3ef SL-276, SL-124 - code and config file cleanup for Bento 2015-12-15 07:34:45 -05:00
Mnikolenko ProductEngine 8a761993da MAINT-957 Double-click Auto-pilot activates for clicks on UI elements, HUDs, some right-clicks 2015-12-15 12:30:29 +02:00
AndreyL ProductEngine 40699b9663 MAINT-5498 LLUrlEntry regex refactoring
Improved LLUrlEntryHTTP, extended a test
2015-12-15 01:17:26 +02:00
Andrey Lihatskiy 88e0605ba2 Merged in andreyl_productengine/viewer-lion-marchcat (pull request #14)
MAINT-5961 FIXED Incorrect position of "Delete all" button within "Notifications" floater
2015-12-15 01:19:38 +02:00