Commit Graph

20751 Commits (7a9fd689bd35b484be728bddac935707d74a4db7)

Author SHA1 Message Date
Oz Linden 7a9fd689bd merge changes for storm-1579 2011-10-13 07:57:24 -04:00
Oz Linden aabdbeadf5 pull back beta fix for sh-2434 2011-10-11 13:55:20 -04:00
Oz Linden 852349218e merge changes for vwr-26864 2011-10-11 10:58:02 -04:00
Oz Linden baf802e25b merge changes for STORM-1641 2011-10-11 10:31:39 -04:00
Oz Linden be251b06eb merge changes for open-38 2011-10-11 09:31:09 -04:00
Oz Linden 61c3b55bd0 expand tabs for coding policy 2011-10-11 09:26:40 -04:00
Jonathan Yap c841337d2b STORM-1579 xml formatting issues in Region/Estate floater
Changed covenant and debug panes per Oz's request.
Covenant is taller; Restart buttons are moved to the right.
2011-10-11 06:11:38 -04:00
Oz Linden a15701de33 merge issues from snowstorm team build 2011-10-07 13:11:43 -04:00
Oz Linden 663ffa3d01 pull back tags from release branch 2011-10-07 09:45:53 -04:00
Oz Linden 32764f8b1d adjust parameters on Snowstorm team builds 2011-10-06 20:33:50 -04:00
Oz Linden 33401ca9b1 merge changes for vwr-26913 2011-10-06 20:24:10 -04:00
Oz Linden df2e5fa37e merge changes for vwr-27026 2011-10-06 20:19:36 -04:00
Oz Linden 0f610e108f merge changes for vwr-27090 2011-10-06 20:17:57 -04:00
Aaron Stone 956c145cc5 VWR-27090 Allow Calling Cards to carry the "(link)" suffix in the Inventory pane 2011-10-06 20:15:18 -04:00
Oz Linden e5f558250b storm-1602 fix NVIDIA ION recognition 2011-10-06 19:52:50 -04:00
Oz Linden f8fc128608 update recognition results for storm-1602 2011-10-06 16:41:36 -04:00
Oz Linden a41ca2c34d merge fixes for storm-1602 up to latest viewer-development 2011-10-06 16:39:23 -04:00
Oz Linden fd91f09e19 STORM-1602 improvements from leliel Mirihi, and more optimizations 2011-10-06 16:37:11 -04:00
Oz Linden 066d63022b fix typo in flag for -u option 2011-10-06 16:30:32 -04:00
Debi King (Dessie) 0a4b187301 merged .hgtags 2011-10-06 14:00:26 -04:00
Debi King (Dessie) 6095127468 Added tag DRTVWR-93_3.1.0-beta1, 3.1.0-beta1 for changeset 2657fa785bbf 2011-10-06 13:55:47 -04:00
Oz Linden 5f38ec7f92 merge changes for storm-1637 2011-10-05 18:02:58 -04:00
Xiaohong Bao 5ef05e151d fix for SH-2434: Mac viewer sometimes freezes at start up and must be force quit. 2011-10-05 15:21:10 -06:00
Nat Goodspeed 30480b58db Automated merge with http://hg.secondlife.com/viewer-development 2011-10-05 11:25:19 -04:00
Oz Linden 194bedbb96 merge changes for vwr-26864 2011-10-05 09:03:24 -04:00
Oz Linden d0e36ade5b increment viewer version to 3.1.1 2011-10-04 06:53:34 -04:00
Oz Linden bba1141fac Added tag 3.1.0-start for changeset c7282e59f374 2011-10-04 06:53:06 -04:00
Oz Linden 4e228b7d66 increment viewer version to 3.1.0 2011-10-04 06:52:55 -04:00
callum 530c44c798 Update LLQtWebKit libraries to version with *ONLY* SSL fix for Mac. 2011-10-03 17:41:07 -07:00
Oz Linden af52ec169f merge changes for storm-1630 2011-10-03 16:40:04 -04:00
Debi King (Dessie) a707614242 Added tag DRTVWR-84_3.0.3-release, 3.0.3-release for changeset 0496d2f74043 2011-10-03 11:18:55 -04:00
Leslie Linden 6eb09ab2ae Removing time offset hack for 'new' tag 2011-09-28 16:59:46 -07:00
Oz Linden a8b74a17cd statically link libcrypto in the Mac build 2011-09-27 18:16:11 -04:00
Oz Linden 174e44ab1e merge changes for storm-1629 2011-09-30 16:36:31 -04:00
eli e033824f8a WIP INTL-46 Update translation for Traditional Chinese 2011-09-30 13:26:25 -07:00
eli 71362ea705 sync with viewer-development 2011-09-30 13:18:49 -07:00
Oz Linden 439149476b merge changes for storm-1603 2011-09-30 13:31:56 -04:00
Oz Linden f7ddde3807 merge changes for storm-1614 2011-09-30 10:09:39 -04:00
Oz Linden b8a19a490a merge changes for storm-1612 2011-09-30 10:09:19 -04:00
Oz Linden 9f5279badf merge changes for storm-1611 2011-09-30 10:08:53 -04:00
Oz Linden 2b42a6f0dc merge changes for storm-1600 2011-09-30 10:08:32 -04:00
Oz Linden 544333ac6b pull back beta branch fix for storm-1620 2011-09-30 10:07:45 -04:00
Vadim ProductEngine f6a8a2c546 STORM-1612 WIP Implemented new click-to-walk/teleport preferences design. 2011-09-29 15:35:02 +03:00
Oz Linden 94ac3f9e10 merge changes for storm-1628 2011-09-29 06:21:02 -04:00
eli 503c8ab789 VWR-27039 FIX FR linguistic 2011-09-28 15:51:08 -07:00
Oz Linden cdc60df8ef merge changes for storm-1597 2011-09-28 17:41:29 -04:00
simon@Simon-PC.lindenlab.com 7d6ea9814e ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewed
by Kelly
2011-09-27 09:32:36 -07:00
jaeger_reg@tank-pc.ftrdhcpuser.net c0410361de Statistic floater update to improve displayed info. 2011-09-26 13:16:17 -07:00
Nat Goodspeed ad9c28a269 Automated merge with http://hg.secondlife.com/viewer-development 2011-09-26 15:44:21 -04:00
Vadim ProductEngine bcdd0b52dd STORM-1612 FOLLOWUP Trivial Windows compilation fix. 2011-09-23 21:46:55 +03:00