Commit Graph

20105 Commits (dbc8d51cd028da9bb5195b0b1f46bbaaff0c84e6)

Author SHA1 Message Date
Oz Linden dbc8d51cd0 merge changes for storm-1041 2011-08-20 07:15:41 -04:00
Oz Linden 574e24c34e merge changes for storm-793 2011-08-20 07:15:20 -04:00
Oz Linden 86ae50784f merge changes for storm-782 2011-08-20 07:14:54 -04:00
Oz Linden 50ea915256 merge changes for storm-1565 2011-08-20 06:34:17 -04:00
Oz Linden fd2b0084bf merge changes for storm-1563 2011-08-19 16:53:56 -04:00
Oz Linden 7ffc8b45e2 merge changes for storm-1564 2011-08-19 16:50:08 -04:00
Oz Linden 2b40cbb13d correct coding policy problems 2011-08-19 16:47:48 -04:00
Richard Linden e15c97404f Automated merge with http://hg.secondlife.com/viewer-development 2011-08-19 11:27:03 -07:00
eli 5eefd0d66d WIP INTL-46 Update translation for Traditional Chinese 2011-08-18 16:22:53 -07:00
Richard Nelson cc4e708848 merge 2011-08-18 14:16:06 -07:00
Richard Nelson 64e3907853 Automated merge with http://hg.secondlife.com/viewer-development 2011-08-18 14:05:27 -07:00
Richard Nelson ff46a6f423 EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimings 2011-08-18 13:59:38 -07:00
Richard Nelson e83cb4e959 Automated merge with bundle:D:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.uw1uld\ssh__richard@hg.lindenlab.com_richard_viewer-experience_njk05b.hg 2011-08-18 09:49:04 -07:00
Oz Linden f40d2c5afb take the newlines off of the language.txt files 2011-08-17 23:07:14 -04:00
callum a666878a01 EXP-700 (VWR-24502) - added Satomi Ahn's name to list of contributors 2011-08-17 12:11:58 -07:00
Oz Linden 7e5be23686 add proper license headers to files that did not have them 2011-08-17 14:43:39 -04:00
callum db92a8cbea EXP-700 FIX SLPlugin(s) takes high CPU%
Reviewed by Richard.
2011-08-17 11:09:00 -07:00
Richard Nelson 20a1f0be0b Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-08-17 10:38:21 -07:00
Oz Linden bf4abf7f4f add proper copyright and license headers 2011-08-17 13:29:30 -04:00
Oz Linden 43fd5ef807 fix files that do not end with a newline (warn-on-failure:copyright because some have both problems...) 2011-08-17 12:42:37 -04:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Oz Linden f368c858cd correct line endings 2011-08-17 12:09:59 -04:00
Oz Linden b2ef0f9988 merge changes for storm-1546 2011-08-17 11:32:27 -04:00
Oz Linden ff2eb602a0 merge changes for storm-1560 2011-08-17 11:31:06 -04:00
Oz Linden 559172d34d merge changes for release tags 2011-08-17 11:29:23 -04:00
Vadim ProductEngine c66e04eace STORM-793 FOLLOWUP Escape ITEM_SLURL in translations. 2011-08-17 13:11:59 +03:00
eli 8843e4384e FIX INTL-66 translation for set26 and basic set5, for 6 languages 2011-08-16 18:13:34 -07:00
Richard Linden 34b4b3d139 fix for tooltips on fast timer debug view not always updating 2011-08-16 16:13:59 -07:00
Oz Linden c067f4ba7a merge back late beta fixes 2011-08-16 19:09:53 -04:00
Richard Linden 2bc6a7ad33 EXP-1100 WIP Show tooltips when drag and drop operations are not allowed
unblock drag and drop tooltips
2011-08-16 15:39:12 -07:00
Richard Linden da91aa1864 EXP-1083 FIX Position of Media control and volume are shifted left with addition of Mode selector in advanced mode 2011-08-16 15:25:31 -07:00
Richard Linden bffd5b3a6c EXP-1099 FIX Cannot drag item on to empty space in outbox folder 2011-08-16 13:59:46 -07:00
eli cf40a8307f sync with viewer-development 2011-08-16 12:32:12 -07:00
Oz Linden 1278223f36 merge missing changesets for storm-1557 2011-08-16 14:45:03 -04:00
Debi King (Dessie) 8379df21bc merged .hgtags 2011-08-16 13:49:35 -04:00
Debi King (Dessie) f99cf295e1 Added tag DRTVWR-74_2.8.3-release, 2.8.3-release for changeset fb85792b84bf 2011-08-16 13:45:13 -04:00
Oz Linden 637e6e66d3 remove map file used to convert old internal repositories to this one 2011-08-16 12:42:06 -04:00
Vadim ProductEngine 136d202255 STORM-793 FIXED Disallowed parsing HTTP URLs in llGiveInventory notifications (one more case).
The fix may look weird because we seem to wrap a SLURL with <nolink>...</nolink> tags.
But actually there is no SLURL, there's just an object name.
Investigating that goes beyond the bug scope.
2011-08-16 19:20:33 +03:00
Richard Nelson e617a059f1 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge 2011-08-15 15:00:41 -07:00
Oz Linden cb957d3dab merge late 3.0.1 beta candidate fixes 2011-08-15 16:35:41 -04:00
Oz Linden 7819b49086 correct tabs for coding policy conformance 2011-08-15 16:28:03 -04:00
Oz Linden b8320207bb merge changes for storm-1557 2011-08-15 16:22:03 -04:00
Vadim ProductEngine 73025e2771 STORM-1041 FIXED "Remove all clothes" item of the avatar menu didn't actually remove all clothes.
I haven't investigated what the problem was, I've just rewritten the (ancient?) removal code
in the way we take off items in other places, i.e. by removing them from the Current Outfit forder.
2011-08-15 22:22:31 +03:00
Richard Nelson 72ffcd147a EXP-1081 FIX add search auth token as cookie instead of query param
fixed search url
2011-08-15 11:12:51 -07:00
Richard Nelson dc8944ac49 EXP-1081 FIX add search auth token as cookie instead of query param
moved all parameters other than search query to base64 encoded llsd
2011-08-15 11:10:00 -07:00
Debi King (Dessie) 45036820f8 merged .hgtags 2011-08-15 12:21:59 -04:00
Vadim ProductEngine 3c8f1dac14 STORM-782 FIXED Removing the useless 'Compress snapshots to disk' item from the Advanced menu.
Removing the corresponding setting as well because it's not used anywhere.
2011-08-15 19:01:28 +03:00
Debi King (Dessie) 91eb63bdde Added tag DRTVWR-78_3.0.0-beta1, 3.0.0-beta1 for changeset b0be6ce3adfe 2011-08-15 11:50:05 -04:00
Oz Linden b21e63cc12 increment viewer version to 3.0.1 2011-08-15 10:36:13 -04:00
Oz Linden 0bee6c278c Added tag 3.0.1-start for changeset 82a2079ffcb5 2011-08-15 10:35:23 -04:00