Commit Graph

23599 Commits (c5373b90eb2de8f29be6801a07e937064ecb7fbb)

Author SHA1 Message Date
Nat Goodspeed c5373b90eb Add 'sourceid' settings var specifically for skin-files insertion.
Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that
"[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
2012-10-15 16:16:24 -04:00
Oz Linden 7f0b247d4b Added tag 3.3.4-release3 for changeset 351eea5f9dc1 2012-08-31 09:01:09 -04:00
Oz Linden 2ba33302f5 tag merge of DRTVWR-207 2012-08-31 08:53:58 -04:00
callum e4230e640a MAINT-1455 FIX Media Texture not visually updated correctly
Reviewed by me. (Bao created)
2012-08-29 11:16:22 -07:00
Oz Linden 173364ed5d Added tag 3.3.4-release2 for changeset 7c9102fb9988 2012-08-20 10:43:45 -04:00
Oz Linden 36fa95058a tag merge of DRTVWR-199 2012-08-20 10:04:38 -04:00
Aura Linden b0c683344f 10.5 macs will begin looking for mac_legacy rather than mac 2012-08-15 12:49:42 -07:00
Oz Linden 3645669241 Added tag 3.3.4-release for changeset 28e100d0379a 2012-07-23 16:05:14 -04:00
Oz Linden 9643dee27e Added tag 3.3.4-beta5 for changeset ab2ffc547c8a 2012-07-18 05:41:55 -07:00
Oz Linden f26dfe4fb9 merge changes for DRTVWR-184 2012-07-18 03:10:25 -04:00
Oz Linden a93cb07df6 tag merge of DRTVWR-184 2012-07-18 03:09:09 -04:00
Dave Parks 636e20be10 MAINT-1223 More aggressive rebuilding of render batches when alpha color values change. 2012-07-17 13:00:33 -05:00
Oz Linden c906d64004 Added tag 3.3.4-beta4 for changeset 6c75f220b103 2012-07-17 13:18:12 -04:00
Oz Linden e49faf96aa merge changes for DRTVWR-183 2012-07-17 12:16:37 -04:00
Oz Linden 291be17078 tag merge of DRTVWR-183 2012-07-17 12:16:22 -04:00
Dave Parks ccac47c1a7 MAINT-1223 Fix for alpha updates not triggering LoD updates. 2012-07-16 14:31:15 -05:00
Oz Linden a4df79bcdc tag merge of DRTVWR-180 2012-07-14 08:50:13 -04:00
Dave Parks f5254d532b MAINT-1262 Fix for crash when setting graphics to Low 2012-07-12 16:53:31 -05:00
Dave Parks 997b360747 MAINT-794 Fix for assert on loading some types of objects before their parents. 2012-07-11 15:17:13 -05:00
Oz Linden f7f27e4f26 Added tag 3.3.4-beta3 for changeset a8057e1b9a12 2012-07-09 12:42:16 -04:00
Oz Linden 690f985a9c merge changes for DRTVWR-177 2012-07-09 11:41:47 -04:00
Oz Linden 1b109f80b9 tag merge of DRTVWR-177 2012-07-09 11:41:22 -04:00
Oz Linden 13f7afbd7d merge changes for DRTVWR-176 2012-07-08 16:39:54 -04:00
Oz Linden 02bb54273f tag merge of DRTVWR-176 2012-07-08 16:39:03 -04:00
callum 51f740ca8d MAINT-1228 FIX Can not put more than one object into the contents of an object
Reviewed by Paul PE
2012-07-06 11:31:37 -07:00
Oz Linden 077e851bdd Added tag 3.3.4-beta2 for changeset 82b5330bc8b1 2012-06-30 06:12:06 -04:00
Oz Linden 0fff60b3c9 merge changes for DRTVWR-174 2012-06-29 16:24:16 -04:00
Oz Linden a49a47def6 tag merge of DRTVWR-174 2012-06-29 16:24:04 -04:00
Oz Linden 595b49b938 merge changes for DRTVWR-173 2012-06-29 16:15:24 -04:00
Oz Linden a6b5b4322c tag merge of DRTVWR-173 2012-06-29 16:15:11 -04:00
callum 11686a0917 Merge with viewer-beta 2012-06-29 10:36:04 -07:00
Oz Linden 326634e1bf Added tag 3.3.4-beta1 for changeset f91d003091a6 2012-06-28 15:41:09 -04:00
Dave Parks 7f38f620fd MAINT-1204 Fix for crash on selecting a texture anywhere other than the build tools. 2012-06-27 17:16:59 -05:00
Kelly Washington a68c7c27f9 Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078 2012-06-27 14:43:10 -07:00
Kelly Washington 14ebeffe87 MAINT-1078 Merchant Outbox import failures
Add 1s throttle on update checks for importer
reviewed with Simon
2012-06-27 11:32:54 -07:00
Oz Linden 8a7fa77f23 correct linux packaging for hunspell library 2012-06-25 22:56:58 -04:00
Oz Linden 9bf7e40e93 Added tag 3.3.4-beta1, DRTVWR-158 for changeset f87bfbe0b62d 2012-06-25 16:55:15 -04:00
Oz Linden eacaf1c0cc tag merge of DRTVWR-170 2012-06-25 14:29:44 -04:00
Dave Parks 667e5d1968 Merge cleanup 2012-06-22 14:59:40 -05:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden 3c276c87bd merge back 3.3.3-release tag 2012-06-21 19:38:15 -04:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Oz Linden b10df0b6c4 tag merge of DRTVWR-168 2012-06-21 17:50:03 -04:00
Oz Linden 90547ff411 Added tag 3.3.3-release for changeset 6428242e124b 2012-06-21 16:44:04 -04:00
Oz Linden f64a79d9d1 merge changes for DRTVWR-171 2012-06-21 14:19:25 -04:00
Oz Linden 4539e5c8e9 tag merge of DRTVWR-171 2012-06-21 14:19:04 -04:00
Oz Linden 5dceb6b06c STORM-1889: require all fields when importing spelling dictionary 2012-06-20 21:52:42 -04:00
callum fd4708c2c4 MAINT-1150 FIX (Speculative) crash on (shutdown) in LLVOAvatar::avString()
Reviewed by vir
2012-06-20 13:37:38 -07:00
Kitty Barnett 8ef14ffb29 STORM-1887 FIXED Added words are not saved in dictionaries if main dictionary was reselected
The user's custom dictionary and ignore list are now independent of the primary dictionary.
2012-06-19 21:48:45 +02:00
Oz Linden ee130adc60 pull back tags for 3.3.3-beta3 2012-06-18 22:18:41 -04:00