Commit Graph

32814 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Aura Linden d476b12ae5 Merged viewer release into vivox 2014-04-07 17:04:09 -07:00
Merov Linden c9a9ab1b6a Pull merge from lindenlab/viewer-release 2014-04-07 16:31:32 -07:00
Merov Linden c79abac5ad Pull merge from lindenlab/viewer-release 2014-04-07 16:19:07 -07:00
simon c9620e24d3 Merge downstream code 2014-04-07 14:29:18 -07:00
simon 991636d57b Merge in viewer-release and version update to 3.7.6 2014-04-07 14:26:15 -07:00
Richard Linden 29840c0c56 Merge 2014-04-07 14:17:39 -07:00
Richard Linden c9c782b596 MAINT-3915 FIX Recent Inventory Tab not showing Recent activity
old logic would interpret "don't care whether or not I am showing wearables" as "filter for just wearables, of any type"
2014-04-07 14:17:15 -07:00
Monty Brandenberg 20c963b42e All: Update curl and llqtwebkit2 packages to new template builds. 2014-04-07 20:04:15 +00:00
Nat Goodspeed 220b4166e7 Automated merge with http://hg.secondlife.com/viewer-release 2014-04-07 15:58:23 -04:00
Oz Linden 7e966f28da increment viewer version to 3.7.6 2014-04-07 15:12:21 -04:00
Oz Linden 130e78d0a0 Added tag 3.7.5-release for changeset fc066b82343f 2014-04-07 15:12:21 -04:00
Monty Brandenberg 30eb6d13f5 Linux/Mac: Update to latest OpenSSL 1.0.1e build. Fix manifest for
openssl on Mac (copy, deploy).  Revert Linux manifest work which tried
to work around 0555 permissions on .sos (and didn't work).
2014-04-07 14:01:34 -04:00
andreykproductengine 508487bdee MAINT-459 FIXED Cannot delete prim displaying media
Fixed interaction with unselected faces while media is selected.
2014-04-07 18:36:02 +03:00
Mnikolenko ProductEngine 1108a34d1d MAINT-3907 FIXED Handle pressing of Alt/Shift/Control keys without any other key being pressed simultaneously. 2014-04-08 12:37:41 +03:00
simon 45651fda5a Merge downstream code 2014-04-07 14:31:36 -07:00
Richard Linden 4363326270 merge 2014-04-07 10:25:04 -07:00
Monty Brandenberg 50d1ca325f Linux: Building some .so's with 0555 permissions now but viewer wants to
strip those down for packaging.  So we'll target those .so's for a chmod.
2014-04-04 23:48:20 +00:00
Monty Brandenberg 1422f89612 Linux: Finish new Boost dependencies to get Linux building again. 2014-04-04 21:59:15 +00:00
Monty Brandenberg 469438707d Library updates and switch to 3d-llqtwebkit2 build products.
SDL to 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0
with coroutine updates/fixes, curl to 7.34.0, libpng to 1.6.8,
openssl to 1.0.1e, zlib to latest 1.2.8 build, llqtwebkit
built from 4.7.1 sources refactored and tested in 3p-llqtwebkit2
repository.

Windows is functional with a good number of warning messages
at runtime from libpng and KDU.  MoaP/slplugin functioning.
2014-04-04 16:30:50 -04:00
Monty Brandenberg d7481cd07c Merge. Refresh from viewer-release after 3.7.4 release. 2014-04-03 18:56:46 -04:00
andreylproductengine 4c3c4e84b2 MAINT-3870 FIXED The freelook animation never ends so the avatar never gets to the idle status... 2014-04-03 19:37:52 +03:00
Mnikolenko ProductEngine f8a43c4815 MAINT-3913 FIXED User is not able to upload any type of image(*.png, *.tga,*.bmp,*.jpg) 2014-04-04 16:28:36 +03:00
andreylproductengine 41d8db0d3e MAINT-3870 FIXED The freelook animation never ends so the avatar never gets to the idle status... 2014-04-03 19:37:52 +03:00
Mnikolenko ProductEngine 873543bd88 MAINT-2536 FIXED Ignore selectTool( gGrabTransientTool ) if mouse down is handled in mouselook and mouse up event is not handled in this mode. 2014-04-02 13:06:53 +03:00
simon 4026a6a4d6 Merge downstream code 2014-04-01 18:45:13 -07:00
simon 565c41fdc2 Merge downstream code 2014-04-01 18:42:15 -07:00
andreykproductengine e96fad30ac MAINT-1180 FIXED Cannot delete object description. 2014-04-01 19:00:21 +03:00
Brad Payne (Vir Linden) d10ecef615 merge 2014-03-31 11:59:11 -04:00
andreykproductengine e9266f6f06 MAINT-1696 FIXED "Owner" name is not clickable in "Place Profile" dialog if region is group owned 2014-03-31 16:38:31 +03:00
andreykproductengine 435c195021 MAINT-1696 FIXED "Owner" name is not clickable in "Place Profile" dialog if region is group owned 2014-03-31 16:38:31 +03:00
Mnikolenko ProductEngine 93f7ac98b6 MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. Confirmation dialog for teleporting via slapp is added. 2014-03-31 10:54:59 +03:00
Nyx Linden 09fa986562 BUG-5537 FIX reverting breaking changes to pectorals and belly.
Fitted mesh introduced a couple of changes to the avatar_lad.xml file
that cause the avatar definition to change in ways that are not backwards-
compatible. Reverted the change in the range of pectoral size for male
avatars, and the change in the position of the belly morph position
(the later being a copy/paste error).
2014-04-01 16:54:07 -04:00
Monty Brandenberg d0a41a1716 OPEN-210 FMOD Ex include confusion. Revert FMODEX.cmake
change from changeset 3d662c2f1aad.  This gave the TPVDs some
grief and was an unfinished attempt at cleanup.
2014-04-01 13:33:32 -04:00
callum_linden ef095034d1 MAINT-3880 FIX Show favorite landmarks on login screen checkbox, is checked in preferences after being unchecked 2014-03-28 15:36:50 -07:00
Ima Mechanique 08ca5279ff storm-1831: Fixing the remaining LL_ERRS. 2014-03-28 21:32:30 +00:00
Ima Mechanique 8bc4278412 strom-1831: Cleaning out commented and unused code 2014-03-28 17:21:36 +00:00
andreykproductengine f7b66fadf6 MAINT-1606 FIXED Warning message 'The object is not for sale' appears while user try to buy the shared object 2014-03-28 17:54:07 +02:00
maksymsproductengine 6ca7c588a8 MAINT-3871 FIXED Recent issues with dragging the World Map. 2014-03-28 19:09:38 +02:00
Mnikolenko ProductEngine dcb9b7fb05 MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. Confirmation dialog for teleporting via slapp is added. 2014-03-31 10:54:59 +03:00
Mnikolenko ProductEngine 4994d9d97d MAINT-3878 FIXED Don't hide folder if it has descendants. 2014-03-28 18:22:03 +02:00
Nat Goodspeed ba892274b3 DRTVWR-363: Fix LLNotificationsListener::listChannels() channel walk.
LLNotifications::ChannelMap went away when LLNotificationChannel became an
LLInstanceTracker subclass. Iterate the universe of channels using
LLNotificationChannel::beginInstances(), endInstances() instead.
More troubling is that LLNotificationChannel::getParentChannelName() went away
too. When LLNotificationChannel acquired a Params block and corresponding
constructor, it acquired the ability to listen on multiple upstream sources.
That meant that a single mParent string became inapplicable, and its access
method was removed. (Curiously, mParent was not itself removed, but it was
left unused.) Change mParent to mParents, a vector<string>, built by
connectToChannel(). Introduce getParents(), an accessor returning an
iterator_range over that vector.
Change LLNotificationsListener::listChannels() to collect a "parents" key in
the map returned for each channel, and -- for backwards compatibility --
capture the first entry in the "parents" array as "parent".
2014-03-28 10:30:03 -04:00
Nat Goodspeed 0fddf9656b DRTVWR-363: re-enable commented-out LLNotificationsListener::listChannels()
and its caller.
2014-03-27 20:03:08 -04:00
Aura Linden dfd78e83d9 Pulled merge from release 2014-03-27 11:59:35 -07:00
maksymsproductengine 8fa3396126 MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory: improving stability 2014-03-27 19:15:08 +02:00
Ima Mechanique 8e53c5bfb0 storm-1831 Removing the callback after first region crossing. Prevents repeated callbacks after highlighting has been removed for live script. 2014-03-26 20:31:05 +00:00
Callum Prentice 62d0ad23f9 MAINT-3881 FIX Pressing the ENTER key when entering a location into the “Type a location” field, doesn't log you in 2014-03-26 12:21:24 -07:00
Callum Prentice 2351cd0596 merge with viewer-release 2014-03-26 11:32:22 -07:00
simon 33dfc0a8a1 Pull in downstream -bear, viewer-release and become version 3.7.5 2014-03-26 10:04:53 -07:00
simon 5c20e06dbd Pull in viewer-release and become version 3.7.5 2014-03-26 10:02:25 -07:00
andreykproductengine e0fb4b5982 MAINT-1851 FIXED Viewer crashes while attempting to close "Snapshot" dialog after pressing on "Snapshot" icon several times at the left toolbar 2014-03-26 16:06:16 +02:00