Commit Graph

16142 Commits (4e02747908a00a2e6103e7a923e522aed0e22ada)

Author SHA1 Message Date
Richard Linden 4e02747908 Automated merge with bundle:F:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.7nrmxq\ssh__richard@hg.lindenlab.com_richard_viewer-experience_gittck.hg 2011-05-12 13:20:09 -07:00
Leyla Farazha 506646b4d0 EXP-802 fixing voice chat enabled persistence 2011-05-12 11:45:09 -07:00
Richard Linden e18f200243 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-05-12 11:38:32 -07:00
Leyla Farazha 524345ab0e merge 2011-05-11 17:54:00 -07:00
Leyla Farazha 9364f995b5 EXP-783 User can accept a call and see end call option in IM window but they are in nearby voice 2011-05-11 17:52:05 -07:00
Leyla Farazha c83eff097e EXP-760 Selecting No Device for output and input in Sound Devices in Basic mode still results in voice having input and output - also 2 default options 2011-05-11 17:46:51 -07:00
Oz Linden 6fcf9e4817 add missed contribution credit for Ima Mechanique 2011-05-11 20:08:25 -04:00
Oz Linden ba568b8945 y 2011-05-11 20:07:36 -04:00
Oz Linden 5ffde6fa6d merge changes for storm-1236 2011-05-11 20:06:05 -04:00
Oz Linden 09bdefabc6 merge changes for storm-1209 2011-05-11 20:05:22 -04:00
Richard Linden a0267151c3 EXP-813 FIX Login screen reloads when clicking on location slapp 2011-05-11 16:43:42 -07:00
Oz Linden 05697cdf29 merge changes for storm-1241 2011-05-11 19:17:34 -04:00
Oz Linden ebc65ada21 null merge of transplant for storm-1241 2011-05-11 19:15:09 -04:00
Richard Linden 9dbc3301f6 EXP-809 FIX Make Script Warning/Error window scrolling behavior match that of Chat history 2011-05-11 13:14:48 -07:00
Oz Linden 7be1755d61 merge changes for VWR-25727 2011-05-11 08:39:54 -04:00
brad kittenbrink c9becd55bd New build of ogg-vorbis package to fix VWR-25727. 2011-05-10 17:22:34 -07:00
brad kittenbrink 32bce75124 New build of ogg-vorbis package to fix VWR-25727. 2011-05-10 17:22:34 -07:00
Richard Linden f1c4c9d237 EXP-806 FIX Server-side messages without a corresponding notification should show original, untranslated content 2011-05-10 17:11:05 -07:00
Oz Linden d86eb3dd42 merge changes for beta fixes 2011-05-10 17:46:32 -04:00
Xiaohong Bao 2a61d908e7 Merge 2011-05-10 13:57:41 -06:00
Vadim ProductEngine 4440526a8e STORM-1209 FIX Object continued sending messages after user adding this object to block list.
Applying Joshua's fix.
2011-05-10 18:58:40 +03:00
Kelly Washington 56e471c399 ER-480 Viewer work for abandoned land.
* Support group members with the right powers buying land set for sale to a group
* Add dialogs for abandoned land related notifications.
2011-05-10 08:40:00 -07:00
Richard Linden 6428924827 EXP-776 WIP [crashhunters] crash in LLCloudLayer::decompress
EXP-777 WIP [crashhunters] crash in LLWind::decompress
added NULL check
2011-05-09 17:24:56 -07:00
callum 604f92fa20 EXP-801 FIX Linden Research Inc text is clipped on login page in Basic mode
(Reverted change back to original behavior - needs attention later)
2011-05-09 17:10:26 -07:00
Leyla Farazha 91956a0f44 merge 2011-05-09 15:23:53 -07:00
Debi King (Dessie) bfae60d082 merged .hgtags 2011-05-09 18:22:23 -04:00
Debi King (Dessie) 1f26ff1b42 Added tag 2.6.8-start for changeset 5e349dbe9cc8 2011-05-09 18:19:16 -04:00
Leyla Farazha 3039663148 EXP-802 Add a check box to enable/disable voice chat. 2011-05-09 15:10:56 -07:00
Debi King (Dessie) 265d363a0f Added tag DRTVWR-52_2.6.6-beta1, 2.6.6-beta1 for changeset bb1075286b3b 2011-05-09 18:07:01 -04:00
Debi King (Dessie) 77c39cef52 merged .hgtags from viewer-pre-beta 2011-05-09 18:00:23 -04:00
Richard Linden e1f2b2b3e8 Automated merge with bundle:F:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.4vsiw5\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_qwnptv.hg 2011-05-09 11:55:47 -07:00
Oz Linden a5118ccd67 increment viewer version to 2.6.9 2011-05-09 09:57:02 -04:00
Oz Linden 078250ff5f Added tag 2.6.8-start for changeset 5e349dbe9cc8 2011-05-09 09:56:20 -04:00
Merov Linden 1e0d3fc7bc EXP-664 : following richard codereview: use llclamp where appropriate 2011-05-07 11:09:34 -07:00
Merov Linden 460aa3ade7 Merge with viewer-experience 2011-05-07 11:01:58 -07:00
Merov Linden 51c779b5e8 Pull from viewer-experience-merge 2011-05-07 10:54:32 -07:00
Oz Linden 510283ce83 storm-1237: merge experience team issues 2011-05-07 10:11:40 -04:00
Oz Linden a941a37627 merge changes for storm-1231 2011-05-07 06:57:58 -04:00
Oz Linden 8b5ebe59ca merge changes for i18n 2011-05-07 06:56:42 -04:00
Oz Linden 8cdf32aa12 merge changes for storm-1093 2011-05-07 06:53:28 -04:00
Jonathan Yap 86180db1f1 STORM-1236 snapshot: Please resize the text box or modify the text so that it fits. 2011-05-06 20:58:48 -04:00
Eli Linden 5544c18466 WIP VWR-24160 en_xui_change accommodate longest string 2011-05-06 17:54:58 -07:00
Eli Linden bb781cbef7 FIX VWR-23696 remove old parameter overrides 2011-05-06 17:27:50 -07:00
Eli Linden e0849adec7 WIP VWR-23688 2011-05-06 16:29:40 -07:00
Eli Linden 099d1795e5 FIX VWR-23615 en_xui_change es it resizing 2011-05-06 15:34:01 -07:00
Leyla Farazha e068e81f9f merge 2011-05-06 14:27:24 -07:00
callum d892256d5b Merge with head 2011-05-06 13:40:13 -07:00
callum 4ad94507dd EXP-623 (SUPPLEMENTAL FIX) Selecting fly option while on click to walk path
flys avatar to end point but avatar spins and shakes when arriving at click point.
2011-05-06 13:39:27 -07:00
Leyla Farazha 483ceba5f4 EXP-769: "Group call requests received in Basic mode"
fixing merge error
2011-05-06 13:36:08 -07:00
Leyla Farazha 4015e6b3c7 fixing flyoutbtn name 2011-05-06 11:39:22 -07:00