Commit Graph

52419 Commits (60aade5ea2ef5f6eda8ccdae2562c8a1dfbafbd2)

Author SHA1 Message Date
Oz Linden 60aade5ea2 add some extra logging to feature table parsing 2017-05-15 15:09:57 -04:00
Ansariel b40866aafc Merge Firestorm LGPL 2017-05-22 23:50:01 +02:00
Ansariel f65c820cdb Merge viewer-bear 2017-05-22 22:08:14 +02:00
Ansariel e19c295cbf Merge Firestorm LGPL 2017-05-22 22:07:38 +02:00
Ansariel d8a48c34b5 Merge LL viewer release 5.0.5 2017-05-22 22:07:14 +02:00
AndreyL ProductEngine 2c0dfcdf49 Merged in lindenlab/viewer-release 2017-05-22 22:03:09 +03: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
AndreyL ProductEngine f5e0a536c1 MAINT-7431 Fixed crash in LLAccordionCtrlTab::showAndFocusHeader() 2017-05-22 03:29:01 +03:00
Beq 8d00cd0a83 [FIRE-16995] [CRASH] A bad object entry in a .slc simobject cache can result in an unreadable/unusable volume
This leaves the volume in an uncertain state and can result in a crash when later code access an uninitialised pointer
return an INVALID_UPDATE instead
2017-05-21 20:48:51 +01:00
Ansariel 135d534d21 Undo the confusing chat console fading time being controlled by a chat toast setting 2017-05-19 20:20:55 +02:00
Ansariel 8b617a5849 Remove XUI callback handlers that are not necessary anymore 2017-05-18 08:58:30 +02:00
Ansariel 0508140b96 Update German translation 2017-05-18 08:56:54 +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_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
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
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 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
Mnikolenko Productengine bb3380b220 MAINT-7359 improve new Avatar Render Settings window 2017-05-10 15:41:16 +03:00
Ansariel 1a003d630a Merge Firestorm LGPL 2017-05-09 19:48:45 +02:00
Nicky 1a2373a564 Quick fix for OSX to be able to compile a version. 2017-05-09 12:01:07 +02:00
andreykproductengine fb7be87beb MAINT-7354 correction to misbehaving 'purge' and notification spam. 2017-05-08 18:05:10 +03:00
Ansariel a07a984598 Merge Firestorm LGPL 2017-05-07 15:49:43 +02:00
Ansariel 93a5cf7eea Just a small sync 2017-05-07 15:11:22 +02:00
Ansariel 1250a71ba5 Fix XUI log warnings 2017-05-07 14:57:46 +02:00
Ansariel a207e635cf Fix background color for preview trash floater 2017-05-07 14:42:54 +02:00
Ansariel 2f6c80b6ea Update German translation 2017-05-07 14:33:59 +02:00
Ansariel 5b44ff5e57 Fixes to English UI 2017-05-07 14:33:29 +02:00
Ansariel 86315d2db2 Remove traces of our link replace feature now that it's part of the LL viewer 2017-05-07 13:35:02 +02:00
Ansariel 9d38c229fa Use our own sync materials feature instead of LL's 2017-05-07 13:22:52 +02:00
Ansariel dcac0dce59 Merge viewer-bear 2017-05-07 13:11:50 +02:00
Ansariel 5aeb7e0ed6 Backed out changeset ce8d4ebd2ed9 for fix from LL 2017-05-07 11:01:31 +02:00
Ansariel 435cbb93ec Merge Firestorm LGPL 2017-05-06 00:27:06 +02:00
Nat Goodspeed 16e9e87d92 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-04 17:36:53 -04:00
Oz Linden 55ff21f58e VOICE-47: Disconnect from voice during teleport to prevent audio artifacts 2017-05-02 14:32:34 -04:00
Nicky 05d9fe641f FIRE-21116; Fixed gload for Linux. 2017-05-01 00:03:03 +02:00
Ansariel 87ccdef161 Fix void and region water flickr by Drake Arconis (Alchemy viewer) 2017-04-28 00:13:04 +02:00
Ansariel 0d626ea5d3 FIRE-21121: "Report Leaving Draw Range" does not persist after logout when checked in Vintage skin people panel 2017-04-27 17:21:47 +02:00
Ansariel d346b873a0 Clean up inventory bridges 2017-04-27 15:50:46 +02:00
Ansariel f299e9f621 Fix reading the wrong channel introduced in ece96388feb1 2017-04-27 11:07:33 +02:00
Ansariel 969078e0e5 Fix GL error GL_INVALID_OPERATION in VertexAttribPointerARB 2017-04-27 11:00:14 +02:00
Ansariel 1c543fc781 Replace GL_TEXTURE_RECTANGLE_ARB with GL_TEXTURE_RECTANGLE 2017-04-27 10:07:20 +02:00
Ansariel 148f0f1d24 Fix GL error GL_INVALID_ENUM in ReadPixels 2017-04-27 09:17:08 +02:00
Ansariel 13e89be3a5 Reset all VertexBuffer during TP 2017-04-26 16:04:06 +02:00