Commit Graph

27733 Commits (0e93223aebbf5809a7ea09e20960feebd82dabf8)

Author SHA1 Message Date
Oz Linden 0e93223aeb Added tag 3.5.2-beta3 for changeset b6a4ac8f1916 2013-05-07 19:03:04 -04:00
Oz Linden 545e033d1e merge changes for DRTVWR-299 2013-05-07 15:11:55 -04:00
Oz Linden 0f3d291ef6 tag merge of DRTVWR-299 2013-05-07 15:11:29 -04:00
Oz Linden f382233fbb merge changes for DRTVWR-315 2013-05-07 13:38:39 -04:00
Oz Linden e921e51c18 tag merge of DRTVWR-315 2013-05-07 13:38:36 -04:00
Oz Linden f864a0b562 tag merge of DRTVWR-316 2013-05-07 13:38:07 -04:00
callum_linden 9707f09fd8 MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown() 2013-05-06 15:01:13 -07:00
Kelly Washington 50cee8d660 MAINT-2655: "Block button in permissions dialog prompt does not block object"
* Fix mute button.
2013-05-03 21:58:19 +00:00
Kelly Washington 06f9f7b2d9 merge 2013-05-03 21:48:17 +00:00
Kelly Washington 8d0d645cd6 MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
* Switch mute to use task id.
reviewed with Simon
2013-05-03 12:53:37 -07:00
Kelly Washington 45a44225f5 MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
* Change text of dialog
* Add callback for mute button
reviewed with Richard and Widely.
2013-05-03 00:58:55 +00:00
Oz Linden 06f5872741 Added tag 3.5.2-beta2 for changeset 509b97acc4ca 2013-05-01 09:02:09 -04:00
callum cce8d02766 MAINT-2629: limit stream searches to prevent hangs on bad streams 2013-05-01 07:27:59 -04:00
Kelly Washington 474905bade MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
* Add the newer run time permissions to the viewer
* Filter requested permissions by those the viewer knows about
* Show a dialog indicating unknown permissions were requested and a new viewer
  will be needed to grant them.
reviewed with Simon and Soft
2013-04-30 16:04:41 -07:00
callum_linden 5d50e2d02d MAINT-2640 Fix for Wrong name of the checkbox Pathfinding view/test floater. 2013-04-30 11:27:08 -07:00
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
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
Oz Linden 0bc7056ae6 Added tag 3.5.1-beta3 for changeset 65ae89aeb7ea 2013-04-23 12:27:12 -04: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
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
Oz Linden 82e3efeddc merge changes for OPEN-173 2013-04-22 10:16:02 -04: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
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
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
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
Oz Linden f16472976e merge changes for 3.5.1-beta2 2013-04-18 13:50:58 -04:00
Oz Linden c8e8ef8517 Added tag 3.5.1-beta2 for changeset 9d8726eca785 2013-04-18 13:18:45 -04:00
Oz Linden 65080feae3 tag merge of DRTVWR-313 2013-04-18 11:25:42 -04:00
Nyx Linden 490edf41eb BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker
Added checks to validate that the selection list is non-empty
2013-04-17 19:20:42 -04:00
callum_linden 6383c8829f New fix for the fix for Linux build now that gcc upgraded to 4.6 by default 2013-04-17 15:56:45 -07:00
callum_linden 1fa45e7448 Fix for Linux build now that gcc upgraded to 4.6 by default 2013-04-17 15:46:40 -07:00
Nyx Linden 82be384d35 merging with viewer-beta 2013-04-17 18:35:20 -04:00