Commit Graph

47997 Commits (3acbcd75d2e4d2a94d83dd5ef448ff0d1c45a6ef)

Author SHA1 Message Date
Ansariel 3acbcd75d2 Merge viewer-bear 2015-12-22 20:57:45 +01:00
Ansariel 41bf131956 Merge Firestorm LGPL 2015-12-22 20:52:10 +01:00
Andrey Lihatskiy 579ed3849a Merged lindenlab/viewer-bear into default 2015-12-22 19:24:33 +02:00
AndreyL ProductEngine 60dfd55eda Merge downstream, version 4.0.1 2015-12-22 11:07:18 +02:00
PanteraPolnocy 2b2c20143d Divide Prefs -> General to two separate tabs
Also altered in all currently supported translations;
Just a bit more breathing space in panels - feel free to change tabs labels, if you find better replacements for the names.
2015-12-21 14:17:31 +01:00
PanteraPolnocy 10257013e2 Updated Polish translation 2015-12-21 10:04:52 +01:00
Ansariel 4bcfbd8294 FIRE-17513: Another crash in LLModalDialog when trying to restore settings on a clean install 2015-12-20 23:20:00 +01:00
Ansariel 812a8fe3c8 Fix about libs section for other languages 2015-12-20 19:46:32 +01:00
Nicky 7741a30e7e Updated CEF for Linux. 2015-12-20 18:44:39 +01:00
Nicky 3c9e2392c1 Merge 2015-12-20 09:52:12 +01:00
Nicky 680b331c12 Public urls for the CEF packages. 2015-12-20 09:47:51 +01:00
Nicky f3403b6afd Installer changes for Windows x64 + CEF. 2015-12-19 16:11:22 +01:00
Nicky e93c405105 CEF plugin for Windows x64. 2015-12-19 15:24:29 +01:00
Nicky f3bb55d7e5 Updated llceflib for Linux. 2015-12-19 06:51:27 +01:00
Nicky 7b5e805eac Merge with viewer-release. 2015-12-19 06:48:56 +01:00
Oz Linden 7b993d15b7 increment viewer version to 4.0.1 2015-12-18 06:30:19 -05:00
Oz Linden 142be5b062 Added tag 4.0.0-release for changeset ae3297cdd03a 2015-12-18 06:30:19 -05:00
Nicky 2ae5b041d4 Update 3p ceflib. 2015-12-17 10:16:36 +01:00
Ansariel d48a2f407b Undo JointMotionListHolder for now... 2015-12-17 09:13:47 +01:00
Nicky 14b4bc8bf2 Merge. 2015-12-17 05:48:33 +01:00
Nicky 6d918a0fb5 Merge. 2015-12-17 05:46:23 +01:00
callum_linden 76e83ec00a merge with head 2015-12-16 18:09:51 -08:00
callum_linden dd3b3a4fca maint-5875 fix llceflib_host.exe' error about missing MSVCP120.dll 2015-12-16 18:09:30 -08:00
callum_linden e07c2f8491 Fix for OS X and Linux - their compilers do not like missing entries in case statement 2015-12-15 16:34:06 -08:00
callum_linden 3bf8929d93 MAINT-5966 - file download failures need feedback 2015-12-15 15:24:41 -08:00
Ansariel 3ecc618367 Add some background for the asset upload message 2015-12-15 20:27:22 +01:00
Ansariel 2a1a16341b FIRE-16960: F...... money tracker still not sorting properly 2015-12-16 09:02:22 +01:00
Rider Linden 3e46058651 MAINT-5962: Added routine for checking MoaP double click and forwarding those double click events into to the plugin. 2015-12-14 14:14:29 -08:00
callum_linden 6582c0238b Pull in new LLCEFLib with updated version number 2015-12-14 11:37:41 -08:00
Ansariel 04544f57c0 FIRE-17478: Exempt group invitations from newline flood check 2015-12-12 13:44:06 +01:00
callum_linden 5f1fe20e9e Missed a commit for MAINT-5948 - enable double click 2015-12-11 16:15:34 -08:00
callum_linden 46d1112163 pick up new version of LLCEFLib with fixes for BUG-10880 2015-12-11 12:21:31 -08:00
PanteraPolnocy f81b496763 FIRE-17458: Change wording Move Lock to Movelock for consistency 2015-12-10 10:16:59 +01:00
Nat Goodspeed cf40d26829 Automated merge with ssh://bitbucket.org/callum_linden/viewer-cef 2015-12-09 07:39:16 -05:00
Nat Goodspeed 9384eac91b MAINT-5862: Change the Linux wording in the ToS floater per Grumpity. 2015-12-09 07:36:06 -05:00
Nicky 3980cdca3e Merge 2015-12-09 07:11:36 +01:00
Mnikolenko ProductEngine 51e4b34ae0 MAINT-5934 FIXED Have to open About Land twice to get parcel ban timings to load in parcel ban list when banned names are not cached 2015-12-07 13:38:13 +02:00
Ansariel 86e91147d1 Backed out changeset 010aa51cbba7 - will be replaced by LL version to prevent merge collisions in the future 2015-12-07 19:50:46 +01:00
Ansariel f11c97a357 FIRE-17440: Right-clicking an entry in the mutelist that is muted by name always selects the first mute by name 2015-12-07 10:53:41 +01:00
Ansariel e663a4d2ba FIRE-17439: Fix crash "Attempt to delete dialog while still in sModalStack!" 2015-12-07 10:11:37 +01:00
Ansariel 24fa3d292f Fix warning "LLView::getChild: Making dummy class LLUICtrl named "desc" in floater" 2015-12-06 21:49:22 +01:00
Ansariel e1ad29227e Change severity of log message to debug 2015-12-06 13:24:04 +01:00
Ansariel e4fb7e22b0 Use SHIFT+ALT+LEFT/RIGHT to switch tab on parent container in case of cascaded tab containers 2015-12-06 13:21:53 +01:00
Ansariel 9fa858a313 Correct mesh upload error message: Limit is 65535, not 65534 2015-12-06 10:32:43 +01:00
callum_linden c3877be954 MAINT-5941 [Valhalla] Default flash to on by default (reverts MAINT-5773) 2015-12-04 11:21:32 -08:00
AndreyL ProductEngine 80bfd16cb0 Merge fix for MAINT-5892 2015-12-04 20:51:52 +02:00
AndreyL ProductEngine 9ab1cb7ae0 MAINT-5892 Argument fix 2015-12-04 20:51:11 +02:00
andreykproductengine 752907b02d MAINT-4260 FIXED Animated agents at high altitudes randomly show up at 0,0,0 2015-12-04 20:16:29 +02:00
callum_linden d795dfa6ec Pull in new LLCEFLib with @rider's fixes for ENTER and Japanese text entry 2015-12-04 08:52:05 -08:00
Ansariel 2751fbdc70 Fix warning "LLModalDialog::stopModal: LLModalDialog::stopModal not in list!" by properly pushing modal alert toasts on the modal dialog stack
Need to call onOpen() for modal alert toasts in setVisible() because the
virtual methods LLModalDialog::openFloater and LLModalDialog::onOpen() never
get invoked by LLFloater - this is only done by LLFloaterReg or if manually
doing so, but not for LLToast
2015-12-04 17:11:40 +01:00