Commit graph

2643 commits

Author SHA1 Message Date
Ryan Huffman
49da7d9a61 Remove sending of session id in request body in favor of header 2016-06-30 14:43:27 -07:00
Ryan Huffman
38776fe007 Fix multiple sessions being created for some users
If a user didn't have send-data activated they don't have their session id
sent in the header of requests, but instead send it inside the request
body. The session id being send in the request included curly braces which
the server considers invalid.
2016-06-30 14:35:27 -07:00
Brad Hefta-Gaub
4510bb1674 Merge pull request #8098 from zzmp/feat/temp-domain-heartbeats
add heartbeats to metaverse for temporary domains
2016-06-24 12:08:37 -07:00
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
Andrew Meadows
e5b89ebd17 bump version number 2016-06-22 15:33:44 -07:00
Zach Pomerantz
eebf8e91c6 add api_key to domains/public_key updates 2016-06-22 12:02:35 -07:00
Zach Pomerantz
3a36b0a2e5 add temporary domain info to account info 2016-06-22 12:02:35 -07:00
Ryan Huffman
847685d224 Add tracking of away.js 2016-06-22 09:06:59 -07:00
Ryan Huffman
890de1bfea Add went-to user activity back in 2016-06-22 08:54:58 -07:00
Ryan Huffman
4e52521f8c Update UserActivityLogger device blacklist 2016-06-21 16:43:16 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
3650377745 Clean up NULL => nullptr 2016-06-16 13:17:31 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0 Move session id storage to AccountManager 2016-06-16 09:19:42 -07:00
Stephen Birarda
59912012c6 clear domain connection refusals on hard reset, not soft 2016-06-15 09:48:53 -07:00
Chris Collins
55330f2205 Merge pull request #8057 from jherico/settings
Fixing issues with unclosed groups in settings persistence
2016-06-14 14:34:14 -07:00
Stephen Birarda
2163f9b5f3 signal once for domain protocol mismatch, case 918 2016-06-14 10:43:45 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Seth Alves
924c949af5 permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things 2016-06-11 15:16:45 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Stephen Birarda
e4ebafa0d8 add a menu option to force the wrong DS connect version 2016-06-09 15:53:19 -07:00
Stephen Birarda
12e5851ba4 fix connection denial message, put version back 2016-06-09 15:53:19 -07:00
Stephen Birarda
f963adb5dd send connection denial for connect version mismatch 2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Stephen Birarda
c5a4a72a84 trigger domain API refresh from DomainHandler 2016-06-09 15:53:19 -07:00
Stephen Birarda
e39c708bf6 require two triggers for API refresh, fix check for ICE domain 2016-06-09 15:53:19 -07:00
Stephen Birarda
f59335ceff don't thrash API re-check when connection denied 2016-06-09 15:53:19 -07:00
Stephen Birarda
8318e9ccc8 Revert "additional revert related change"
This reverts commit 3119b654dc.
2016-06-09 15:53:19 -07:00
Stephen Birarda
1e9e264124 Revert "Revert "refresh API info during re-connect - case 570""
This reverts commit b8c80e2222.
2016-06-09 15:53:19 -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
0c18df6278 don't restart domain-server if the only settings changes where permissions 2016-06-06 16:32:18 -07:00
Seth Alves
be403865fc don't request public keys for the standard psuedo-account-names 2016-06-04 10:44:59 -07:00
Seth Alves
80eeff5a64 bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided 2016-06-04 10:32:07 -07:00
Seth Alves
adf893ea19 rename AgentPermissions to NodePermissions 2016-06-04 09:50:36 -07:00
Seth Alves
09b0e3eaaf use constants rather than bare strings for standard psuedo-account-names 2016-06-04 09:07:34 -07:00
Seth Alves
b88bba8672 add code to convert older domain-settings to current style 2016-06-03 13:15:53 -07:00
Seth Alves
d010dc9699 keep localhost line from being added every save. added some debugging print stuff 2016-06-02 15:08:16 -07:00
Seth Alves
83f2c723eb collect permissions into their own data structure 2016-06-02 13:15:30 -07:00
Brad Hefta-Gaub
3119b654dc additional revert related change 2016-05-31 20:50:12 -07:00
Brad Hefta-Gaub
b8c80e2222 Revert "refresh API info during re-connect - case 570"
This reverts commit e8d7f9614a.
2016-05-31 20:39:16 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Stephen Birarda
1ec421350d send the UUID session ID without curly braces 2016-05-26 14:56:51 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899 Merge pull request #7971 from birarda/session-id-with-place-request
optionally include the metaverse session ID as HTTP header when sending usage data
2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision
Improved Avatar Mixer Rotation Precision
2016-05-25 17:14:12 -07:00
Stephen Birarda
66bdbf910d optionally include the metaverse session ID as an http header 2016-05-25 11:55:04 -07:00
Stephen Birarda
3137cd64e1 clear AddressManager previous lookup on 404 2016-05-25 11:40:17 -07:00