summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-08Automated merge with head of lindenlab/viewer64Callum Prentice
2017-06-07Pull in new version of 3p-Dullahan that was build against CEF 3.021 (Chrome ↵Callum Prentice
59) for Windows 32/64 and macOS 64
2017-06-06merge Oz's support fixes for TPV support in VMPGlenn Glazer
2017-06-06add unit test case, upgrade to VMP package 506059Glenn Glazer
2017-06-05MAINT-7192: upgrade to VMP package 505928Glenn Glazer
2017-06-01upgrade to vmp package 505843, oz tpv fixesGlenn Glazer
2017-06-01update viewer-managerOz Linden
2017-05-30update SL-702 changes based on code reviewOz Linden
2017-05-30merge changes for SL-700 from viewer64-vmp-integrationOz Linden
2017-05-24SL-702: refactor to make the viewer-manager easier for TPVs to integrateOz Linden
2017-05-24no-op edit to force a rebuildBrad Payne (Vir Linden)
2017-05-23upgrade to VMP package 505471Glenn Glazer
2017-05-23update viewer-manager to solve service url problemOz Linden
2017-05-23pull from gateGlenn Glazer
2017-05-23pull from gateGlenn Glazer
2017-05-23DRTVWR-418: Reconcile new code with new Alex Ivy LLPipeline API.Nat Goodspeed
2017-05-22Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-05-22mergeBrad Payne (Vir Linden)
2017-05-22increment viewer version to 5.0.6Oz Linden
2017-05-22Added tag 5.0.5-release for changeset b4d76b5590fdOz Linden
2017-05-19upgrade to viewer-manager that supports setting update server via ↵Oz Linden
SL_UPDATE_SERVICE
2017-05-18merge latest updates from coyotOz Linden
2017-05-17dummy checkin to build an upgrade targetGlenn Glazer
2017-05-18Linux buildfix; this should be reverted after gcc update to 4.7+AndreyL ProductEngine
2017-05-17update vmp package to 505345Glenn Glazer
2017-05-17nerf launch from NSISGlenn Glazer
2017-05-17update vmp package to 505332Glenn Glazer
2017-05-17update vmp package to 505320Glenn Glazer
2017-05-17update vmp package to 505307Glenn Glazer
2017-05-17Merged in nat_linden/viewer-neko (pull request #262)nat_linden
Add LLEventBatch, LLEventThrottle, LLEventBatchThrottle classes. Approved-by: Rider Linden <rider@lindenlab.com> Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2017-05-17MAINT-7274 Remove "identifier" arg from the messageMnikolenko Productengine
2017-05-16MAINT-7414 FIXED Confirmation is not shown when removing multiple items at ↵Mnikolenko Productengine
once when above InventoryTrashMaxCapacity limit
2017-05-15MAINT-7383 show notifications for Purge item action in all inventory panelsMnikolenko Productengine
2017-05-15MAINT-7413 Display confirmation dialog after clicking Empty Trash on Trash ↵Mnikolenko Productengine
floater
2017-05-12pull from v64 gateGlenn Glazer
2017-05-11MAINT-7403 Disallow emptying Trash while in the Recent tab of InventoryMnikolenko Productengine
2017-05-11Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-05-11Merged in coyot/viewer64-build-results-dotted (pull request #11)nat_linden
Approved-by: Scott Lawrence (Oz Linden) <oz@lindenlab.com>
2017-05-10upgrade to VMP package 505153Glenn Glazer
2017-05-10Add size limit to LLEventBatchThrottle like LLEventBatch.Nat Goodspeed
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-10Automated merge with ssh://bitbucket.org/lindenlab/viewer-nekoNat Goodspeed
2017-05-10Add LLEventThrottle tests; actually *all* lleventfilter.cpp tests.Nat Goodspeed
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-10DRTVWR-418, MAINT-6996: Update Mac mem queries (per Drake Arconis)Nat Goodspeed
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-10Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-05-10dummy commitGlenn Glazer
2017-05-10MAINT-7359 improve new Avatar Render Settings windowMnikolenko Productengine
2017-05-09upgrade to VMP package 505113Glenn Glazer
2017-05-09DRTVWR-418: Set -std=c++14 for Mac even before viewer-build-variables.Nat Goodspeed
2017-05-09DRTVWR-418: Harmless commit to force a TeamCity rebuild.Nat Goodspeed
2017-05-09MAINT-7343 - improved error case handling and checking for unlikely cornersBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 17:09:43 +0000