Commit Graph

27817 Commits (705d85fb2f0856fdc19fd5f71f4dea33951db015)

Author SHA1 Message Date
Oz Linden 2bcc75470d Override default channel from buildscripts project 2013-04-30 14:19:34 -04:00
Oz Linden 889d02b52d merge changes for CHOP-913 2013-04-30 08:57:29 -04:00
Oz Linden ca7de31a6c MAINT-2613: remove duplicate entry for "DisablePrecacheDelayAfterTeleporting", and fix a few other llsd validity problems 2013-04-29 14:34:29 -04:00
Oz Linden c040839ef0 pull tag for 3.5.1-release 2013-04-30 08:52:54 -04:00
Oz Linden 2ef8fc41e7 Added tag 3.5.2-beta1 for changeset 106f19cc011a 2013-04-25 18:47:28 -04:00
Oz Linden 1beb15c93b Added tag 3.5.1-release for changeset 13149a524874 2013-04-25 17:59:45 -04:00
Oz Linden c822d0ec9f increment viewer version number to 3.5.2 (in new file) 2013-04-25 17:03:49 -04:00
Oz Linden 8453b202b8 merge changes for latest viewer-development 2013-04-25 17:03:07 -04:00
PavelK ProductEngine d07fab9e16 CHUI-759 FIXED Group invites never received in do not disturb mode when leaving do not disturb mode 2013-04-25 18:47:09 +03:00
Mnikolenko ProductEngine 8431da8de0 CHUI-953 FIXED Close conversation floater when quitting viewer 2013-04-30 16:09:52 +03:00
maksymsproductengine 503605641a CHUI-956 FIXED Vertical scrollbar in conversation list not scrolls off bottom 2013-04-29 23:01:07 +03:00
maksymsproductengine d2c9543a19 CHUI-859 FIXED Conversation panel moves when new message received with Open Conversation window preference 2013-04-26 06:39:08 +03:00
Mnikolenko ProductEngine 724cab416f CHUI-952 FIXED Disable single line mode when restoring floater. 2013-04-26 14:33:17 +03:00
maksymsproductengine 1c5659b1ca CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0 2013-04-25 20:02:36 +03:00
Mnikolenko ProductEngine e4207901d7 CHUI-934 FIXED Do not add to vector if session is closed to avoid crash. 2013-04-25 14:52:28 +03:00
Merov Linden 5cf1c9bfe1 CHUI-845 : Make changeLine() a bit more resistant to unforseen line count values (i.e. 0) and a bit more general 2013-04-24 17:26:09 -07:00
Oz Linden 2dc4f8f8e9 merge changes for DRTVWR-309 2013-04-24 18:52:59 -04:00
Oz Linden f89d1c9665 tag merge of DRTVWR-309 2013-04-24 18:49:27 -04:00
eli 774277e9cf FIX INTL-114 translation for 9 languages of major update from CHUI (based on latest merge with viewer-development) 2013-04-24 13:56:53 -07:00
eli 80772aa1ad sync with viewer-development (per DRTVWR-309) 2013-04-24 13:49:11 -07:00
Oz Linden aae4b025cb merge changes for latest viewer-development 2013-04-23 14:44:54 -04:00
Oz Linden bfb1ab134f merge changes for 3.5.1-beta3 2013-04-23 14:29:24 -04:00
Merov Linden a01233b684 Pull merge from lindenlab/viewer-chui 2013-04-23 11:05:53 -07:00
Oz Linden 0bc7056ae6 Added tag 3.5.1-beta3 for changeset 65ae89aeb7ea 2013-04-23 12:27:12 -04:00
mberezhnoy fbd82229a0 merge 2013-04-23 18:51:54 +03:00
mberezhnoy df7596e901 CHUI-950 (Reduce min width of messages panel ) 2013-04-23 18:51:26 +03:00
Oz Linden 5fcb76f252 tag merge of DRTVWR-314 2013-04-23 11:43:14 -04:00
Nyx Linden 97fe351d6b merging in tags from beta 2 2013-04-23 11:29:51 -04:00
Merov Linden 54de43834c Pull merge from lindenlab/viewer-chui 2013-04-23 07:23:10 -07:00
Mnikolenko ProductEngine 25c222e317 CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby chat. 2013-04-23 15:09:41 +03:00
Merov Linden 244734647c Pull merge from lindenlab/viewer-chui 2013-04-22 23:22:09 -07:00
Nyx Linden 06d7845a5a SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special characters.
Integrated Nicky Dasmijn's patch to handle the unicode file paths properly.
Code reviewed, patch was clean.
Tested locally, correctly allows wearables to load where they would fail before.
Should be ready for automated build & QA.
2013-04-22 19:14:24 -04:00
Merov Linden 022dd12460 CHUI-912 : Fixed! Filtering with types do work correctly again (including None). 2013-04-22 15:51:15 -07:00
Oz Linden 82e3efeddc merge changes for OPEN-173 2013-04-22 10:16:02 -04:00
Merov Linden f59af8d27c CHUI-912 : Some clean up of vestigial debug code 2013-04-19 19:02:21 -07:00
callum b7cf8931d4 OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via Latif Khalifa & Siana Gearz) - additional fix. Team City gave me the wrong MD5 for 3p-package 2013-04-19 17:16:23 -07:00
Merov Linden 2cc1fb250f CHUI-849 : Use a time limit for filtering instead of number limit, use a different limit for visible and unvisible lists 2013-04-19 16:51:44 -07:00
callum d9de58b46a OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via Latif Khalifa & Siana Gearz) 2013-04-19 16:29:11 -07:00
Oz Linden 3bb708d706 merge up to latest viewer-development for merge to 3.5.2 2013-04-19 14:42:56 -04:00
mberezhnoy cfd132a0de merge 2013-04-19 17:50:48 +03:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Oz Linden be1bb8d76d tag merge of DRTVWR-294 2013-04-19 10:10:17 -04:00
mberezhnoy 6a33964984 CHUI-915 ([CHUIBUG]Control+W hides Conversations floater instead of closing active tab) 2013-04-19 15:31:19 +03:00
Mnikolenko ProductEngine 09b70845e5 CHUI-946 FIXED Return FALSE if key is not handled here. 2013-04-19 14:52:37 +03:00
Merov Linden 03ad10d258 CHUI-849 : WIP : Filter limit on time instead of number of items 2013-04-18 19:46:08 -07:00
maksymsproductengine 88528cb901 CHUI-808 FIXED Draggable separator between conversations and message pane is not discoverable: minor fix; 2013-04-19 00:45:59 +03:00
Oz Linden ed2b5da8f1 merge changes for DRTVWR-298 2013-04-18 14:55:28 -04:00
Oz Linden adfa7d49de tag merge of DRTVWR-298 2013-04-18 14:55:23 -04:00
Oz Linden 35cbd7d777 add newline 2013-04-18 14:55:03 -04:00
callum_linden a1ca90f893 Blank line on end of files as per commit hook requirements 2013-04-18 11:50:40 -07:00