Commit Graph

21532 Commits (052d8a8f2eeb4501a62096e2565f377a03f6a609)

Author SHA1 Message Date
Oz Linden 052d8a8f2e merge changes for storm-1679 2011-11-21 09:11:01 -05:00
Oz Linden 8fef957618 merge changes for storm-1685 2011-11-16 16:06:37 -05:00
Debi King (Dessie) 0bfc95fe7c merged back 3.2.1-release tag 2011-11-15 18:32:19 -05:00
Debi King (Dessie) c69ebf3670 merge 2011-11-15 18:30:23 -05:00
Debi King (Dessie) aaa085cebf reconciled .hgtags 2011-11-15 18:28:17 -05:00
Debi King (Dessie) dcfec3b084 Added tag DRTVWR-99_3.2.1-release, 3.2.1-release for changeset a8c7030d6845 2011-11-15 18:26:02 -05:00
Oz Linden 7766ccb773 increment viewer version to 3.2.4 2011-11-14 11:23:12 -05:00
Oz Linden aae362c451 Added tag 3.2.3-start for changeset 80f3e30d8aa4 2011-11-14 11:22:27 -05:00
Oz Linden 274cbf1a0b merge changes for vmrg-184 2011-11-14 09:32:00 -05:00
Oz Linden ebf0b70e05 merge changes for vmrg-183 2011-11-11 14:57:14 -05:00
Oz Linden 201c6cd5ec pull back beta tags 2011-11-11 14:56:27 -05:00
Oz Linden fb3e378ab7 pull back release tags 2011-11-11 14:55:42 -05:00
Ansariel Hiller bdb27b7e81 STORM-1685 Wrong named control in floater_world_map.xml
Patch converted to hg format by Jonathan Yap.
2011-11-11 14:13:56 -05:00
Jonathan Yap 93e3617e8b STORM-1679 Adjusted ARC_LIMIT to 20,000 per updated instructions from Nyx. 2011-11-11 12:29:25 -05:00
Leslie Linden 5a31ac4aee EXP-1488 fix from Sergey PE 2011-11-10 12:53:52 -08:00
Leslie Linden 55207c8499 EXP-1536 fix from paul PE 2011-11-10 11:46:39 -08:00
Richard Linden b2fffa74f7 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-10 10:58:11 -08:00
Debi King (Dessie) d1d8ae974c Added tag DRTVWR-102_3.2.2-beta1, 3.2.2-beta1 for changeset 523df3e67378 2011-11-10 13:14:36 -05:00
Debi King (Dessie) 2b5eeffcb8 reconciled .hgtags 2011-11-10 13:10:34 -05:00
Debi King (Dessie) ca5abb6fe7 Added tag DRTVWR-100_3.2.1-beta1, 3.2.1-beta1 for changeset 9e390d76807f 2011-11-10 11:57:28 -05:00
Debi King (Dessie) 0c59eb8875 reconciled .hgtags 2011-11-10 11:52:36 -05:00
Richard Linden 55d2829414 EXP-1557 FIXED Voice icon shown next to IM chiclets slightly taller than IM chiclet image 2011-11-09 13:20:59 -08:00
Richard Linden 35a4718869 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-11-09 13:01:46 -08:00
Richard Linden 136751b8fb EXP-1482 FIX LLInitParam::Parser spam in secondlife.log file when entering a search term in location bar launching the search window
reviewed by Merov
2011-11-09 12:56:25 -08:00
Leslie Linden 3ecba909a3 Merge from PE. Thanks Paul 2011-11-09 11:15:41 -08:00
Leslie Linden 0b323da48a Merge from Paul PE. Thanks Paul 2011-11-09 11:11:08 -08:00
Leslie Linden cef45c1823 EXP-1548 folder FIX -- Clicking show on inventory offer does not open inventory (or received items panel) on test grid Ravi set to use Received Items folder for transfers 2011-11-09 11:04:00 -08:00
Paul ProductEngine 58138aa37b EXP-1537 FIXED (Selecting More Info from Classified section in Search floater launches People panel with inactive Edit button and access to OLD profile window)
- Opening Floater Picks instead of old profile panel
2011-11-09 14:28:41 +02:00
Debi King (Dessie) 6bce3d1b9d reconciled .hgtags 2011-11-08 19:45:54 -05:00
Oz Linden 5fa125ea0b increment viewer version to 3.2.3 2011-11-08 18:02:08 -05:00
Oz Linden bc2c01e230 Added tag 3.2.2-start for changeset 40b46edba007 2011-11-08 18:01:29 -05:00
eli 8f0ef6fcb0 WIP INTL-82 more LQA changes for Russian 2011-11-08 13:54:52 -08:00
Oz Linden 6b516b7a6c merge changes for vmrg-182 2011-11-08 15:59:50 -05:00
Oz Linden 89b75e7531 merge changes for vmrg-181 2011-11-08 15:07:45 -05:00
Oz Linden 22dd6acbc9 merge changes for storm-1580 2011-11-08 15:06:43 -05:00
Debi King (Dessie) 860777473a reconciled .hgtags 2011-11-08 14:36:02 -05:00
Debi King (Dessie) 66fdc6af3e Added tag DRTVWR-94_3.2.0-release, 3.2.0-release for changeset 3150219d229d 2011-11-08 14:32:09 -05:00
Oz Linden 281fde3c48 merge changes for storm-1105 2011-11-08 14:08:01 -05:00
Oz Linden d3eb5ac875 merge changes for storm-1222 2011-11-08 14:07:04 -05:00
Oz Linden 49f2c4f78a merge changes for storm-1674 2011-11-08 14:05:16 -05:00
Oz Linden 450dc71396 merge changes for storm-1659 2011-11-08 14:04:17 -05:00
Oz Linden 5729441b46 merge changes for storm-1676 2011-11-08 14:03:19 -05:00
Oz Linden de825f2cbe merge changes for storm-1677 2011-11-08 14:02:07 -05:00
Oz Linden f504270121 merge changes for storm-1678 2011-11-08 14:01:01 -05:00
Oz Linden 28c26cb491 merge changes for vmrg-177 2011-11-08 10:26:12 -05:00
Oz Linden 9b9829a97e merge changes for vmrg-178 2011-11-08 10:25:27 -05:00
Vadim ProductEngine 97a9ce1575 STORM-1580 WIP Fixed some icon sizes and fonts according to spec. 2011-11-08 02:27:57 +02:00
Richard Linden f4afd56f26 EXP-1459 FIX Places panel shown on logni when destination selected from login page 2011-11-07 16:23:40 -08:00
Richard Linden 648ce247d6 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-11-07 15:05:12 -08:00
Richard Linden 1941d75eb0 finished removing remnants of media browser 2011-11-07 15:05:03 -08:00