Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Nat Goodspeed fe64db61d6 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-22 21:30:26 -04:00
Brad Payne (Vir Linden) 806fd24704 merge 2017-05-22 21:09:07 +01:00
Oz Linden 48af8529a8 increment viewer version to 5.0.6 2017-05-22 14:21:49 -04:00
Oz Linden fbd0032fdf Added tag 5.0.5-release for changeset b4d76b5590fd 2017-05-22 14:21:48 -04:00
Oz Linden d0549dea00 upgrade to viewer-manager that supports setting update server via SL_UPDATE_SERVICE 2017-05-19 09:54:59 -04:00
Oz Linden 013f34ccdd merge latest updates from coyot 2017-05-18 15:33:58 -04:00
Glenn Glazer 4bf1f1d618 dummy checkin to build an upgrade target 2017-05-17 18:10:43 -07:00
AndreyL ProductEngine 4a90678cc7 Linux buildfix; this should be reverted after gcc update to 4.7+ 2017-05-18 03:13:57 +03:00
Glenn Glazer 52687641b2 update vmp package to 505345 2017-05-17 16:18:58 -07:00
Glenn Glazer a31aecc730 nerf launch from NSIS 2017-05-17 16:12:18 -07:00
Glenn Glazer 2150e038e8 update vmp package to 505332 2017-05-17 14:01:53 -07:00
Glenn Glazer 7bc1b9d70e update vmp package to 505320 2017-05-17 11:30:53 -07:00
Glenn Glazer dca547858d update vmp package to 505307 2017-05-17 08:45:10 -07:00
nat_linden 6233797388 Merged in nat_linden/viewer-neko (pull request #262)
Add LLEventBatch, LLEventThrottle, LLEventBatchThrottle classes.

Approved-by: Rider Linden <rider@lindenlab.com>
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2017-05-17 14:53:00 +00:00
Mnikolenko Productengine 03984764a7 MAINT-7274 Remove "identifier" arg from the message 2017-05-17 16:52:09 +03:00
Mnikolenko Productengine 424b30ee3e MAINT-7414 FIXED Confirmation is not shown when removing multiple items at once when above InventoryTrashMaxCapacity limit 2017-05-16 18:03:25 +03:00
Oz Linden f9e049c9e5 add some extra logging to feature table parsing 2017-05-15 15:09:57 -04:00
Mnikolenko Productengine 5bd00f8602 MAINT-7383 show notifications for Purge item action in all inventory panels 2017-05-15 16:47:18 +03:00
Mnikolenko Productengine 23af757686 MAINT-7413 Display confirmation dialog after clicking Empty Trash on Trash floater 2017-05-15 15:17:33 +03:00
Glenn Glazer 9b3166ffc0 pull from v64 gate 2017-05-12 08:18:22 -07:00
Mnikolenko Productengine 8e6d54e7b9 MAINT-7403 Disallow emptying Trash while in the Recent tab of Inventory 2017-05-11 17:18:43 +03:00
Nat Goodspeed b92ab8f7e6 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-05-11 06:47:50 -04:00
nat_linden 0b4f516230 Merged in coyot/viewer64-build-results-dotted (pull request #11)
Approved-by: Scott Lawrence (Oz Linden) <oz@lindenlab.com>
2017-05-11 10:44:56 +00:00
Glenn Glazer 1dcc9e3e11 upgrade to VMP package 505153 2017-05-10 15:35:49 -07:00
Nat Goodspeed 4d87ded886 Add size limit to LLEventBatchThrottle like LLEventBatch.
The new behavior is that it will flush when either the pending batch has grown
to the specified size, or the time interval has expired.
2017-05-10 17:37:06 -04:00
Nat Goodspeed 51b0592093 Automated merge with ssh://bitbucket.org/lindenlab/viewer-neko 2017-05-10 15:37:11 -04:00
Nat Goodspeed 9c66072cac Add LLEventThrottle tests; actually *all* lleventfilter.cpp tests.
For some reason there wasn't an entry in indra/llcommon/CMakeLists.txt to run
the tests in indra/llcommon/tests/lleventfilter_test.cpp. It seems likely that
at some point it existed, since all previous tests built and ran successfully.
In any case, (re-)add lleventfilter_test.cpp to the set of llcommon tests.
Also alphabetize them to make it easier to find a particular test invocation.

Also add new tests for LLEventThrottle.

To support this, refactor the concrete LLEventThrottle class into
LLEventThrottleBase containing all the tricky logic, with pure virtual
methods for access to LLTimer and LLEventTimeout, and an LLEventThrottle
subclass containing the LLTimer and LLEventTimeout instances and corresponding
implementations of the new pure virtual methods.

That permits us to introduce TestEventThrottle, an alternate subclass with
dummy implementations of the methods related to LLTimer and LLEventTimeout. In
particular, we can explicitly advance simulated realtime to simulate
particular LLTimer and LLEventTimeout behaviors.

Finally, introduce Concat, a test LLEventPump listener class whose function is
to concatenate received string event data into a composite string so we can
readily test for particular sequences of events.
2017-05-10 15:04:18 -04:00
Nat Goodspeed 9fa131b088 DRTVWR-418, MAINT-6996: Update Mac mem queries (per Drake Arconis)
Drake points out that the OS X 64-bit-capable memory-query APIs recommended in
comments by some long-ago maintainer are by now themselves obsolete. He
offered this patch to update us to current macOS memory APIs.
2017-05-10 14:19:44 -04:00
Nat Goodspeed 54180e6e6b Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-05-10 14:12:52 -04:00
Glenn Glazer 6f215d1608 dummy commit 2017-05-10 07:18:55 -07:00
Mnikolenko Productengine bb3380b220 MAINT-7359 improve new Avatar Render Settings window 2017-05-10 15:41:16 +03:00
Glenn Glazer b6f0cbdb39 upgrade to VMP package 505113 2017-05-09 16:36:24 -07:00
Nat Goodspeed 22eb4cf772 DRTVWR-418: Set -std=c++14 for Mac even before viewer-build-variables. 2017-05-09 14:21:35 -04:00
Nat Goodspeed d2e720a651 DRTVWR-418: Harmless commit to force a TeamCity rebuild. 2017-05-09 13:04:03 -04:00
Brad Payne (Vir Linden) 8528a9ae13 MAINT-7343 - improved error case handling and checking for unlikely corners 2017-05-09 10:58:43 -04:00
Nat Goodspeed 8502b7dc47 DRTVWR-418: Work around VS2013's lack of __has_feature(). 2017-05-08 12:33:33 -04:00
andreykproductengine fb7be87beb MAINT-7354 correction to misbehaving 'purge' and notification spam. 2017-05-08 18:05:10 +03:00
Nat Goodspeed ccc42830ee DRTVWR-418: Fix vector assignment for C++03.
For the time being we're still compiling for production with C++03. Although
assigning an initializer list to a vector is valid C++11, in C++03 mode clang
rejects it.
2017-05-08 10:05:15 -04:00
Nat Goodspeed 93029a5a66 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-05-08 09:10:22 -04:00
Nat Goodspeed 322c4c6bec DRTVWR-418: Fix -std=c++11 llinstancetracker_test crash.
LLInstanceTracker<T> performs validation in ~LLInstanceTracker(). Normally
validation failure logs an error and terminates the program, which is fine. In
the test executable, though, we want validation failure to throw an exception
instead so we can catch it and continue testing other failure conditions. But
since destructors in C++11 are implicitly noexcept(true), that exception never
made it out of ~LLInstanceTracker(): it crashed the test program instead.
Declaring ~LLInstanceTracker() noexcept(false) solves that, allowing the test
program to catch the exception and continue.

However, if we unconditionally declare that, then every destructor anywhere in
the inheritance hierarchy for any LLInstanceTracker subclass must also be
noexcept(false)! That's way too pervasive, especially for functionality we
only need (or want) in a specific test executable.

Instead, make the CMake macros LL_ADD_PROJECT_UNIT_TESTS() and
LL_ADD_INTEGRATION_TEST() -- with which we define all viewer build-time tests
-- define two new command-line macros: LL_TEST=testname and LL_TEST_testname.
That way, preprocessor logic in a header file can detect whether it's being
compiled for production code or for a test executable.

(While at it, encapsulate in a new GET_OPT_SOURCE_FILE_PROPERTY() CMake macro
an ugly repetitive pattern. The builtin GET_SOURCE_FILE_PROPERTY() sets the
target variable to "NOTFOUND" -- rather than an empty string -- if the
specified property wasn't set. Every call to GET_SOURCE_FILE_PROPERTY() in
LL_ADD_PROJECT_UNIT_TESTS() was followed by a test for NOTFOUND and an
assignment to "". Wrap all that in a macro whose 'unset' value is "".)

Now llinstancetracker.h can detect when we're building the LLInstanceTracker
unit test executable, and *only then* declare ~LLInstanceTracker() as
noexcept(false). We #define LLINSTANCETRACKER_DTOR_NOEXCEPT to expand either
empty or noexcept(false), also detecting clang in C++11 mode. (It all works
fine without noexcept(false) until we turn on C++11 mode.)

We also use that macro for the StatBase class in lltrace.h. Turns out some of
the infrastructure headers required for tests in general, including the
LLInstanceTracker test, use LLInstanceTracker. Fortunately that appears to be
the only other class we must annotate this way for the LLInstanceTracker tests.
2017-05-08 09:09:22 -04:00
Glenn Glazer 4ca5dec699 upgrade to VMP package 505055 2017-05-05 16:17:24 -07:00
coyot@coyot-sager-PC.hsd1.ca.comcast.net a1194ce6e9 pull from gate 2017-05-05 18:07:00 +01:00
Glenn Glazer c15ffb4045 upgrade to VMP package 505035, include Oz's logging changes 2017-05-05 09:26:56 -07:00
Oz Linden ab3742a2a9 update to clarified log content messages in the VMP logs 2017-05-05 09:21:48 -04:00
nat_linden 322767f98e Merged in lindenlab/viewer64-callum (pull request #15)
Expand the way we set C++ flags in cmake to call out each build type explicitly

Approved-by: nat_linden <nat@lindenlab.com>
2017-05-04 23:14:20 +00:00
Callum Prentice 0288e5e8cf Expand the way we set C++ flags in cmake to call out each build type explicitly 2017-05-04 16:05:59 -07:00
Nat Goodspeed 49cfd6d991 DRTVWR-418, MAINT-6996: On Mac, obtain total mem, not resident mem.
The LLMemory method getCurrentRSS() is defined to return the "resident set
size," but in fact on Windows it returns the WorkingSetSize -- and that's
actually what callers want from it: the total memory consumed by the
application for statistics purposes. It's not really clear what users gain by
knowing how much of that is resident in real memory, versus the total
consumption. So despite the commentation and the method name itself, on Mac
make it return the virtual size consumed.
2017-05-04 18:13:56 -04:00
Nat Goodspeed 16e9e87d92 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-04 17:36:53 -04:00
Nat Goodspeed a4467e9ffe Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11 2017-05-04 17:16:12 -04:00
Oz Linden c187f67140 add SL-standard format logging 2017-05-04 16:35:19 -04:00