Commit Graph

3289 Commits (60aade5ea2ef5f6eda8ccdae2562c8a1dfbafbd2)

Author SHA1 Message Date
Ansariel b40866aafc Merge Firestorm LGPL 2017-05-22 23:50:01 +02:00
Ansariel 55baa89640 Merge viewer-bear 2017-05-18 08:55:43 +02:00
AndreyL ProductEngine 4a90678cc7 Linux buildfix; this should be reverted after gcc update to 4.7+ 2017-05-18 03:13:57 +03: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
Ansariel dcac0dce59 Merge viewer-bear 2017-05-07 13:11:50 +02:00
Ansariel 2fff7fe963 Merge viewer-vivox 2017-04-20 00:33:01 +02:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine 0dcb423cf3 MAINT-7145 Eliminate LLSingleton circular references 2017-04-25 17:48:34 +03:00
Oz Linden fd3628ef45 Change certificate store infrastructure to key off of the Subject Key
Id rather than sha1 hash, since that is rarely used in modern
certs. The previous form was storing trusted certs using an empty sha1
hash value as the key, which meant most certificates matched... not good.

Modify the LLCertException to pass certificate information back as
LLSD rather than an LLPointer<LLCertificate>, because when the
exception is being thown from the certificate constructor that results
in one of a couple of other exceptions (even refcounting won't save
you when the problem is that the thing you're pointing to never
finished coming into being properly).

Update the certificates in the llsechandler_basic_test to modern
conventions, and extend the classes to allow for an optional
validation date so that the test can use a fixed date. Also make all
the certificates include the plain text form for ease of reference.
2017-04-14 16:05:59 -04:00
andreykproductengine 10213f994f MAINT-6283 Names that contain 'http:' or 'https:' were causing new line in chat history 2017-04-07 20:29:24 +03:00
mnikolenko c27dbc6214 MAINT-6404 FIXED When pasting text with mac linebreak into a notecard, it shouldn't be removed 2017-04-03 02:21:18 +03:00
Nat Goodspeed 2fe4f6b918 MAINT-6789: Add LLEventThrottle::getInterval(), setInterval()
plus LLEventBatch::getSize(), setSize()
plus LLEventThrottle::getPostCount() and getDelay().

The interesting thing about LLEventThrottle::setInterval() and
LLEventBatch::setSize() is that either might cause an immediate flush().
2017-03-24 18:25:16 -04:00
Nat Goodspeed 7af4a49835 MAINT-6789: Add LLEventBatch, LLEventThrottle, LLEventBatchThrottle.
These classes are as yet untested: they are straw people for API review, based
on email conversations with Caladbolg and Rider.
2017-03-23 22:39:31 -04:00
Ansariel 915496bbea Merge viewer-vivox 2017-03-21 22:14:02 +01:00
Oz Linden dd63291355 construct tag string without using += 2017-03-09 17:56:30 -05:00
Oz Linden e479d51068 experiment reformatting of tags in log lines 2017-03-09 14:16:33 -05:00
Oz Linden 8dff769dc9 do not insert a null char into the std::string when serializing llsd notation 2017-03-09 11:32:06 -05:00
Oz Linden 0a7fd3686a Look for logcontrol-dev.xml in the user settings directory 2017-02-27 09:52:50 -05:00
Tonya Souther 76fe127f76 Compile fix for OS X. 2017-02-04 10:25:25 -06:00
Oz Linden 1925fd2b8b merge changes for 5.0.1-release 2017-02-02 15:49:16 -05:00
Ansariel 8c083cf771 Merge Firestorm LGPL 2016-12-05 22:40:59 +01:00
Oz Linden c21571474c merge changes for 5.0.0-release 2016-12-05 15:20:27 -05:00
AndreyL ProductEngine 2abd0eef41 Merged in lindenlab/viewer-release
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Ansariel 16acd2d20a Merge Firestorm LGPL 2016-12-04 14:05:44 +01:00
Ansariel 1f1ea62a40 Merge Firestorm LGPL 2016-12-04 12:44:37 +01:00
Kitty Barnett 4503a28aee Merged with RLVa fixes 2016-12-03 17:13:17 +01:00
Ansariel aa25acc045 Merge Firestorm LGPL 2016-11-30 09:43:52 +01:00
Ansariel 5351c445a8 Merge Firestorm LGPL 2016-11-29 19:26:31 +01:00
Kitty Barnett c07bfee1f2 Added the @list and @stopim IM queries
--HG--
branch : RLVa
2016-11-20 21:03:32 +01:00
Ansariel 5a58635b64 Merge Firestorm LGPL 2016-11-16 16:11:56 +01:00
Oz Linden fd2ccb1606 merge changes for 4.1.2-release 2016-11-16 09:52:59 -05:00
Brad Payne (Vir Linden) d31596db6a merge 2016-11-16 08:39:41 -05:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
AndreyL ProductEngine 7fceb3a63f Merged in lindenlab/viewer-cleanup 2016-11-14 22:04:37 +02:00
Ansariel 3fed6c743a Merge Firestorm LGPL 2016-11-11 16:04:29 +01:00
Ansariel 42c77ab5bc Merge Firestorm LGPL 2016-11-04 12:52:13 +01:00
andreykproductengine 7daef28f7c MAINT-6825 Fixing bad_alloc crash 2016-10-28 17:29:30 +03:00
andreykproductengine 26e73e2f58 MAINT-6825 Fixing bad_alloc crash 2016-10-28 17:29:30 +03:00
Ansariel 79c0b8a9b5 Merge viewer-bear 2016-10-19 10:56:32 +02:00
Ansariel 951f829d26 Fix log output formatting 2016-11-26 03:35:27 +01:00
Brad Payne (Vir Linden) 0200135224 merge 2016-10-18 16:59:15 -04:00
Oz Linden 8e30a2f06d merge changes for 4.1.1-release 2016-10-18 15:38:33 -04:00
andreykproductengine 759b4f14d8 MAINT-6828 Removed unnessesary spam in logs 2016-10-13 22:49:06 +03:00
AndreyL ProductEngine 740159f004 Merged in lindenlab/viewer-bear 2016-10-15 07:08:22 +03:00
Nat Goodspeed 23d50f53cb MAINT-5232: Ensure custom operator<<() overload is visible to TUT. 2016-10-13 07:11:18 -04:00
Nat Goodspeed 763509589d MAINT-5232: Add LLHeteroMap to contain objects of unrelated classes. 2016-10-12 23:01:48 -04:00
Ansariel 13e2832747 Merge Firestorm LGPL 2016-10-12 14:10:48 +02:00
Glenn Glazer 86be29fe80 merge maint-6633 to fork of viewer-bear 2016-10-11 14:42:58 -07:00