Commit Graph

29995 Commits (a1e986e2b0fefa2b8ecc995c5449c0a1b8556675)

Author SHA1 Message Date
Mnikolenko ProductEngine a1e986e2b0 MAINT-3364 FIXED Call clearSelection() from root_folder 2014-01-10 12:37:01 +02:00
simon ade7faae58 Merge downstream -bear 2014-01-09 10:56:44 -08:00
simon 6b4a357230 Merge 3.6.14 from release 2014-01-09 10:53:01 -08:00
simon e89bda2586 Merge 3.6.14 2014-01-09 10:50:20 -08:00
Oz Linden d8a81b240e increment viewer version to 3.6.14 2014-01-08 18:46:23 -05:00
Oz Linden 19a41cc243 Added tag 3.6.13-release for changeset 0d9b9e50f1a8 2014-01-08 18:45:48 -05:00
Mnikolenko ProductEngine c243578337 MAINT-3520 FIXED Сall arrange(NULL, NULL) to avoid occasional drag'n'drop folders after renaming. 2014-01-08 12:34:35 +02:00
Simon Linden a773cdd6f7 Fix linux build 2014-01-08 02:36:12 +00:00
simon f291995dac Revert changes made for MAINT-535 to test in a release cohort. 2014-01-07 15:18:29 -08:00
MaximB ProductEngine dd1bd943b9 MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint) 2014-01-02 22:29:46 +02:00
MaximB ProductEngine 39e76aaea8 MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint) 2014-01-01 03:43:56 +02:00
Mnikolenko ProductEngine ab71e294e0 MAINT-3570 FIXED Callbacks for menu item are added. 2013-12-26 12:34:50 +02:00
maksymsproductengine 9af766f582 MAINT-3587 FIXED settings.xml still references avatarsunited.com for snapshot upload 2013-12-21 00:15:08 +02:00
Oz Linden 05fa5e525b improve build.sh searches for additional package installers 2013-12-18 14:53:27 -05:00
Oz Linden ba39f6e14f add "A" test channel package 2013-12-17 16:42:01 -05:00
Aura Linden 1219fe0e1b Mac Fullscreen fix for MAINT-3288 and MAINT-3135 2013-12-17 00:13:07 -08:00
Aura Linden ddd6b8f91b Mac Fullscreen fix for MAINT-3288 and MAINT-3135 2013-12-17 00:12:26 -08:00
simon 6f34508aa9 Merge downstream code 2013-12-13 10:01:43 -08:00
Mnikolenko ProductEngine 99de75c225 MAINT-3522 FIXED Continue loop after adding Nearby chat history to the list. 2013-12-13 16:48:28 +02:00
MaximB ProductEngine ea940a2113 merge 2013-12-13 00:06:04 +02:00
MaximB ProductEngine 72d2d1a975 MAINT-3519 (Resident is able to share worn clothes.) 2013-12-12 09:38:02 +02:00
MaximB ProductEngine 2a1098552e MAINT-3541 (crash in std::vector >::reserve) 2013-12-12 07:24:13 +02:00
MaximB ProductEngine f3a50a5084 MAINT-3541 (crash in std::vector >::reserve) 2013-12-12 07:24:13 +02:00
Oz Linden 35add2252b MAINT-3575: remove old exe if found in current install directory 2013-12-11 17:43:55 -05:00
maksymsproductengine 06d6659845 removing of dos line ending 2013-12-11 22:01:24 +02:00
Oz Linden 69dfa3507a Workaround for MAINT 3099: remove any Vivox log file left in the program folder 2013-12-11 11:17:31 -05:00
Oz Linden 9399448987 BUG-4685: remove any SecondLife.exe file left in the SecondLifeViewer folder by an install prior to 3.12 2013-12-11 09:53:48 -05:00
Mnikolenko ProductEngine 065bbf7d38 MAINT-3553 Another checking is added to avoid possible crash. 2013-12-11 14:42:02 +02:00
simon 321a81e371 Re-fix merge issue that removed "AvatarRenderInfo" cap usage 2013-12-10 13:24:10 -08:00
Oz Linden c017694d39 MAINT-3571: include settings_install.xml whether it contains settings or not 2013-12-10 15:42:21 -05:00
Richard Linden dd0d7de67d Automated merge with http://bitbucket.org/lindenlab/viewer-lion 2013-12-09 16:15:13 -08:00
simon 50cba7940f Merge in downstream code for 3.6.13 2013-12-09 16:11:09 -08:00
Richard Linden 813bc232e7 MAINT-3017 FIX Inventory filter for Recent tab does not persist between sessions as it used to.
added names back to inventory filters, so they can be deserialized
2013-12-09 15:42:51 -08:00
Oz Linden 1a9b9f1bd1 increment viewer version to 3.6.13 2013-12-09 14:52:47 -05:00
Oz Linden 65123c4029 Added tag 3.6.12-release for changeset 88bbfd7a6971 2013-12-09 14:52:45 -05:00
Mnikolenko ProductEngine 1a456c2e41 MAINT-3539 Additional checking was added to avoid possible crash. 2013-12-09 13:02:06 +02:00
Mnikolenko ProductEngine 4a09065691 MAINT-3539 Additional checking was added to avoid possible crash. 2013-12-09 13:02:06 +02:00
simon 6212cd2950 MAINT-3552: crash in LLPanel::getString: Failed to find string ErrorFetchingServerReleaseNotesURL in panel floater_about 2013-12-06 17:13:30 -08:00
simon bde3be7b5d MAINT-3552: crash in LLPanel::getString: Failed to find string ErrorFetchingServerReleaseNotesURL in panel floater_about 2013-12-06 17:13:30 -08:00
simon de94e8c232 Merge latest viewer release for 3.6.13 2013-12-09 15:52:00 -08:00
simon 5bef957159 MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling 2013-12-06 15:44:18 -08:00
Nat Goodspeed 56cbfdd55c Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489 2013-12-03 20:45:31 -05:00
PavelK ProductEngine 443c502ccc MAINT-3476 FIX Opening large chat histories from conversation log eats up huge amounts of memory, leading to viewer crash. 2013-12-03 19:32:56 +02:00
Mnikolenko ProductEngine 21d9e524f6 MAINT-3262 FIXED Cannot select image to upload to Web profile 2013-12-05 12:51:36 +02:00
maksymsproductengine 69569df61c MAINT-3351 FIXED Misleading failure message when user is successfully removed from a group's Owners role 2013-12-04 20:28:10 +02:00
MaximB ProductEngine ab687d3d21 merge 2013-12-03 19:28:21 +02:00
Mnikolenko ProductEngine 522a4d02e3 MAINT-3506 FIXED Allocate appropriate amount of memory for temp variable. 2013-12-03 14:37:55 +02:00
MaximB ProductEngine 6989a45747 MAINT-1769 (URL-like resident display name is shown as hyperlink in Share confirmation window) 2013-12-03 11:11:44 +02:00
MaximB ProductEngine c0ecaeb5d8 merge 2013-12-03 09:29:01 +02:00
MaximB ProductEngine b93374e070 MAINT-3334 (If a chat tab is in focus when you enter mouselook, chat that occurs while in mouselook does not display after exiting mouselook) 2013-11-28 14:16:35 +02:00