Commit graph

129 commits

Author SHA1 Message Date
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
ZappoMan
0655b47dd7 fix warnings 2017-01-23 16:44:55 -08:00
Ryan Huffman
e9c6e9dd5c Move MessageID to ClientServerUtils 2017-01-20 16:43:11 -08:00
Brad Davis
a593a2116a Removing magic numbers 2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab Consume fewer resources in AssetServer when interface is running locally 2017-01-17 18:15:39 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Stephen Birarda
eb8f67b612 cleanup asset file regex, comment in renameMapping 2016-10-19 11:47:57 -07:00
Stephen Birarda
7aac2e6916 restrict asset file mapping operations to file path 2016-10-19 10:57:23 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Ryan Huffman
b4b7b7ea34 Update all asset server responses to be reliable 2016-07-13 13:41:45 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
Seth Alves
0980ab5c2d Merge pull request #7634 from birarda/asset-server-clean
cleanup unmapped asset server files
2016-04-12 11:59:41 -07:00
Stephen Birarda
190d11e0bf rename the set of hashes to check for deletion 2016-04-11 17:16:52 -07:00
Stephen Birarda
026f58c866 don't perform asset cleanup if mapping file load fails 2016-04-11 17:14:31 -07:00
Stephen Birarda
334dc3cb6c cleanup left file debug, add check for deleted mapping 2016-04-11 09:05:11 -07:00
Stephen Birarda
775898893b add deletion of unmapped files during delete op 2016-04-11 08:57:07 -07:00
Stephen Birarda
fae9b061a3 promote a debug to info 2016-04-11 08:42:52 -07:00
Stephen Birarda
4d0976f730 remove migration code for pre-mapping migrations 2016-04-11 08:41:42 -07:00
Atlante45
86b425143b Use Mbps for max bandwith 2016-03-31 11:03:06 -07:00
Stephen Birarda
882a0272c0 add simple cleanup of unmapped assets on start 2016-03-31 09:54:30 -07:00
Atlante45
d5f6ca5e1c Add max bandwidth setting 2016-03-21 14:50:18 -07:00
Stephen Birarda
92b287355c make TRUNCATED_HASH_NUM_CHAR a non-static const 2016-03-15 15:56:13 -07:00
Stephen Birarda
b13dff1c77 Revert "remove redundant static from const in AssetServer"
This reverts commit 0837261d403e844f648f4f4ddcce7d7b79c7083b.
2016-03-15 14:38:08 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Stephen Birarda
b8abb1b6dd remove redundant static from const in AssetServer 2016-03-15 14:38:08 -07:00
Stephen Birarda
630f5303b2 overwrite existing asset during upload if hash doesn't match 2016-03-11 13:23:57 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Stephen Birarda
9522c2d17c add file open and write error handling 2016-03-11 11:04:34 -08:00
Stephen Birarda
6f550292f4 pass delete paths by reference for trimming 2016-03-10 16:57:39 -08:00
Stephen Birarda
e94e2ece2e add trimming to paths on asset server 2016-03-10 16:57:39 -08:00
Stephen Birarda
e93bc8317f remove an extra space 2016-03-10 14:48:44 -08:00
Stephen Birarda
50a05df721 fix asset loading with error changes 2016-03-10 11:58:57 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
ae3c0f6646 add hash and path checking 2016-03-09 18:03:44 -08:00
Stephen Birarda
672f8ec1f7 add checking for leading slash in mapping operations 2016-03-09 17:43:31 -08:00
Stephen Birarda
7b08ae3747 drop invalid mappings on AssetServer load 2016-03-09 17:30:02 -08:00
Clément Brisset
aeee89eb15 Merge pull request #86 from birarda/atp-mappings
disable client caching of ATP mappings, fix bug retreiving assets
2016-03-09 14:40:57 -08:00
Stephen Birarda
e2b976d9f1 remove debug, fix asset find bug for incorrect folder 2016-03-09 14:24:35 -08:00
Stephen Birarda
a986403237 add a leading slash for faked migrated mappings 2016-03-09 13:42:35 -08:00
Stephen Birarda
d3dc81c7a0 add delete debug, handle rename in memory state rollback 2016-03-09 13:37:39 -08:00
Stephen Birarda
5e9751c6ed bug fixes for rename/delete operations 2016-03-09 13:28:05 -08:00
Stephen Birarda
a65d06c7ce fix rename to take old mapping first 2016-03-09 13:14:55 -08:00
Stephen Birarda
6b8a71f96a add debug for mapping operations 2016-03-09 12:16:36 -08:00
Stephen Birarda
a53b038ac2 add folder delete handling 2016-03-09 12:10:36 -08:00
Stephen Birarda
03c38eada3 add folder rename handling 2016-03-09 12:06:33 -08:00
Stephen Birarda
6abd1c50b2 remove the inlined writeError in AssetServer 2016-03-08 15:45:13 -08:00
Stephen Birarda
33cadb36da add server side handling for mapping rename 2016-03-08 14:57:22 -08:00
Stephen Birarda
793d20306d handle multiple paths for mapping delete operations 2016-03-08 14:24:03 -08:00
Stephen Birarda
8fa32e75b2 client side fixes for upload with no extension 2016-03-08 12:19:15 -08:00