e18e1375a0
merge changes for .v-r
2011-08-20 08:49:31 -04:00
f34b579e53
merge back release tags
2011-08-20 08:48:51 -04:00
958eaee399
merge back beta tags
2011-08-20 08:48:30 -04:00
abfbd86598
merge changes for storm-1562
2011-08-20 07:16:01 -04:00
dbc8d51cd0
merge changes for storm-1041
2011-08-20 07:15:41 -04:00
574e24c34e
merge changes for storm-793
2011-08-20 07:15:20 -04:00
86ae50784f
merge changes for storm-782
2011-08-20 07:14:54 -04:00
50ea915256
merge changes for storm-1565
2011-08-20 06:34:17 -04:00
fd2b0084bf
merge changes for storm-1563
2011-08-19 16:53:56 -04:00
7ffc8b45e2
merge changes for storm-1564
2011-08-19 16:50:08 -04:00
2b40cbb13d
correct coding policy problems
2011-08-19 16:47:48 -04:00
7768d7e3fe
Added tag DRTVWR-81_3.0.1-beta1, 3.0.1-beta1 for changeset 364fd63517fb
2011-08-19 15:20:38 -04:00
e15c97404f
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-19 11:27:03 -07:00
5eefd0d66d
WIP INTL-46 Update translation for Traditional Chinese
2011-08-18 16:22:53 -07:00
cc4e708848
merge
2011-08-18 14:16:06 -07:00
64e3907853
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-18 14:05:27 -07:00
ff46a6f423
EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimings
2011-08-18 13:59:38 -07:00
b73291e9bd
merged .hgtags
2011-08-18 14:48:59 -04:00
ba1589d118
merged .hgtags
2011-08-18 14:46:32 -04:00
d36a9a7907
Added tag DRTVWR-74_2.8.3-release, 2.8.3-release for changeset fb85792b84bf
2011-08-18 14:44:09 -04:00
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
f40d2c5afb
take the newlines off of the language.txt files
2011-08-17 23:07:14 -04:00
25e2d384b0
storm-1562: disable multi-threaded curl to prevent crash
2011-08-17 16:11:37 -04:00
a666878a01
EXP-700 (VWR-24502) - added Satomi Ahn's name to list of contributors
2011-08-17 12:11:58 -07:00
7e5be23686
add proper license headers to files that did not have them
2011-08-17 14:43:39 -04:00
db92a8cbea
EXP-700 FIX SLPlugin(s) takes high CPU%
...
Reviewed by Richard.
2011-08-17 11:09:00 -07:00
20a1f0be0b
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-08-17 10:38:21 -07:00
bf4abf7f4f
add proper copyright and license headers
2011-08-17 13:29:30 -04:00
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
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
f368c858cd
correct line endings
2011-08-17 12:09:59 -04:00
b2ef0f9988
merge changes for storm-1546
2011-08-17 11:32:27 -04:00
ff2eb602a0
merge changes for storm-1560
2011-08-17 11:31:06 -04:00
559172d34d
merge changes for release tags
2011-08-17 11:29:23 -04:00
c66e04eace
STORM-793 FOLLOWUP Escape ITEM_SLURL in translations.
2011-08-17 13:11:59 +03:00
8843e4384e
FIX INTL-66 translation for set26 and basic set5, for 6 languages
2011-08-16 18:13:34 -07:00
34b4b3d139
fix for tooltips on fast timer debug view not always updating
2011-08-16 16:13:59 -07:00
c067f4ba7a
merge back late beta fixes
2011-08-16 19:09:53 -04:00
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
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
bffd5b3a6c
EXP-1099 FIX Cannot drag item on to empty space in outbox folder
2011-08-16 13:59:46 -07:00
cf40a8307f
sync with viewer-development
2011-08-16 12:32:12 -07:00
1278223f36
merge missing changesets for storm-1557
2011-08-16 14:45:03 -04:00
8379df21bc
merged .hgtags
2011-08-16 13:49:35 -04:00
f99cf295e1
Added tag DRTVWR-74_2.8.3-release, 2.8.3-release for changeset fb85792b84bf
2011-08-16 13:45:13 -04:00
637e6e66d3
remove map file used to convert old internal repositories to this one
2011-08-16 12:42:06 -04:00
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
e617a059f1
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
2011-08-15 15:00:41 -07:00
cb957d3dab
merge late 3.0.1 beta candidate fixes
2011-08-15 16:35:41 -04:00
7819b49086
correct tabs for coding policy conformance
2011-08-15 16:28:03 -04:00
Oz Linden