Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 13:04:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49558 commits 75 branches 59 tags 1.2 GiB
Commit graph

1030 commits

Author SHA1 Message Date
Seth Alves
764da926a3 merge sethalves:make-permissions-names-case-insensitive 2016-06-17 19:22:22 -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
Seth Alves
de100e8141 after receiving a group's ID from api, save it 2016-06-17 13:29:42 -07:00
Seth Alves
6fae35d9f2 start on handling group permissions 2016-06-16 16:42:15 -07:00
Seth Alves
dd24143d16 start on handling group permissions 2016-06-16 16:41:47 -07:00
Seth Alves
d184aade1b comments 2016-06-16 16:40:57 -07:00
Zach Pomerantz
1ce9e96cba Send domain metadata for authed domains 2016-06-16 13:00:28 -07:00
Seth Alves
e79767a121 authed username wasn't being saved in permissions, so that interface would get briefly disconnected when their permissions changed. 2016-06-11 15:16:02 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -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
Seth Alves
441b5a20d8 merge from upstream 2016-06-09 13:23:41 -07:00
Zach Pomerantz
9926c80917 Only check user metadata before sending 2016-06-08 18:45:01 -05:00
Seth Alves
8085266c1d cause names in permissions tables to be alpha-sorted 2016-06-08 10:36:44 -07:00
Seth Alves
7696ead012 look for standard permissions in standard table rather than in user table 2016-06-07 16:38:52 -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
d202a2bf11 better handling of missing settings keys 2016-06-06 11:59:39 -07:00
Seth Alves
a4e4093a18 split permissions into two sets, one for 'standard' ones and one for specific users 2016-06-06 10:39:47 -07:00
Seth Alves
dd009bf8b9 add some debugging prints. make blacklisting work 2016-06-04 11:06:37 -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
Zach Pomerantz
09e0a2ced7 Parse basic metadata into DomainMetadata 2016-06-03 15:13:09 -07:00
Zach Pomerantz
209ace1b86 Include anonymously connected user metadata 2016-06-03 15:00:43 -07:00
Zach Pomerantz
55e5c1f6e0 Declare metadata descriptors 2016-06-03 15:00:42 -07:00
Seth Alves
b88bba8672 add code to convert older domain-settings to current style 2016-06-03 13:15:53 -07:00
Zach Pomerantz
5c293646b9 Segment metadata users 2016-06-02 17:22:39 -07:00
Zach Pomerantz
85055d82bf Regenerate Domain metadata on user (dis)connect 2016-06-02 17:05:58 -07:00
Seth Alves
41a8e9fa91 missed a protocol change 2016-06-02 16:53:52 -07:00
Zach Pomerantz
b13e7a1a8f Encapsulate metadata in DomainMetadata 2016-06-02 16:04:27 -07:00
Seth Alves
fc92268641 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-02 15:38:24 -07:00
Zach Pomerantz
18696144f1 Move metadata generation to DomainMetadata 2016-06-02 15:36:29 -07:00
Zach Pomerantz
87e27d9570 Factor out metadata generation from heartbeat 2016-06-02 15:35:47 -07:00
Zach Pomerantz
bf920c2b80 Compact Domain heartbeat JSON 2016-06-02 15:34:36 -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
83cba2dd82 start on code to convert from settings version 1.2 to 1.3 2016-06-02 13:28:36 -07:00
Seth Alves
83f2c723eb collect permissions into their own data structure 2016-06-02 13:15:30 -07:00
Seth Alves
ae0c8a96f2 code to unpack permissions into a usable data structure 2016-06-01 15:33:24 -07:00
Seth Alves
7810ed6313 working toward a permissions grid in domain-server settings 2016-05-31 16:56:08 -07:00
Zach Pomerantz
b280eebd03 Only count users against max capacity 2016-05-27 15:51:41 -07:00
Brad Hefta-Gaub
fb9f6185db CR feedback 2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub
183f38e4f0 pop up warning if domain over capacity 2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Stephen Birarda
5ab876114f send hostname to DS with every DS packet to handle changes 2016-05-20 11:24:54 -07:00
Stephen Birarda
962066c7d1 send user hostname breakdown with heartbeat 2016-05-20 11:24:54 -07:00
Stephen Birarda
7d2d60f200 split assigned and un-assigned nodes 2016-05-20 11:24:54 -07:00
Stephen Birarda
5884e1eadd rename metaverse heartbeat methods 2016-05-20 11:24:54 -07:00
Stephen Birarda
3b2a9b7b98 fix set of place name on DomainServerNodeData 2016-05-20 11:24:54 -07:00
Stephen Birarda
7110fe98eb associate incoming place name with DomainServerNodeData 2016-05-20 11:24:54 -07:00
Ryan Huffman
79ce64aa3a Fix compilation error in DomainServer.cpp 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Stephen Birarda
84df6cfed0 only re-request ice addresses during failure 2016-04-14 14:46:08 -07:00
Stephen Birarda
3f0ffc0aff update ice-server address with API, add failed and clear denials 2016-04-14 10:33:17 -07:00
Stephen Birarda
55002b8d5e add ice server address to hearbeat if full networking is on 2016-04-14 09:27:43 -07:00
Stephen Birarda
ab414f65eb output success on first connection to new ice-server 2016-04-12 18:23:51 -07:00
Stephen Birarda
f69f59fa90 handle ice fail for no reply heartbeat in DS 2016-04-12 18:19:02 -07:00
Stephen Birarda
f1209dc82d fix index randomization for single candidate ice-server 2016-04-12 18:04:32 -07:00
Stephen Birarda
f975f480b4 use the random device for random number generation 2016-04-12 17:46:47 -07:00
Stephen Birarda
b5fe6120aa base randomization of ice-server from ice.highfidelity.com 2016-04-12 17:41:47 -07:00
Stephen Birarda
455d2d5048 allow for an empty password with a username 2016-04-12 09:37:26 -07:00
Stephen Birarda
a0edbac486 change comment for domain-server migration to SHA256 2016-04-05 14:12:50 -07:00
Stephen Birarda
7cd115f421 store and transmit passwords as SHA256 hash 2016-04-05 14:11:12 -07:00
Stephen Birarda
5054243655 compare HTTP auth password to base 64 settings value 2016-04-05 14:11:12 -07:00
Stephen Birarda
fd2ee8ce4e add migration of plaintext password to base64 2016-04-05 14:11:12 -07:00
Stephen Birarda
078872a6db correct returned OAuth redirect URL 2016-03-21 15:26:26 -07:00
Stephen Birarda
7f3761481c don't store UUIDs for cookies on disk 2016-03-21 15:22:32 -07:00
Stephen Birarda
510e8e89f2 fix a crash in DS with missing cert/key 2016-03-21 15:22:05 -07:00
Stephen Birarda
35973d4e30 re-use same socketed node for subsequent connections 2016-03-01 17:02:34 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Stephen Birarda
f1aca57543 remove a tab in whitespace only line 2016-02-24 16:30:34 -08:00
Stephen Birarda
f8392e62a8 some wording tweaks in comments 2016-02-23 17:43:01 -08:00
Stephen Birarda
0191d75e86 allow temporary domain to upload public key 2016-02-23 17:29:15 -08:00
Stephen Birarda
3a800350c9 re-set the ice heartbeat packet if keypair changes 2016-02-23 15:42:28 -08:00
Stephen Birarda
96ed19100b use ice-server heartbeat denial to trigger keypair re-gen 2016-02-23 15:26:13 -08:00
Stephen Birarda
4b4ea25ed6 immediately send ice heartbeat once keypair is ready 2016-02-23 11:24:26 -08:00
Stephen Birarda
83e8c248bd repairs to failure case for keypair generation 2016-02-23 11:20:21 -08:00
Stephen Birarda
e2f02347dd repairs to issues discovered during ID change 2016-02-23 10:57:54 -08:00
Stephen Birarda
d510ee0e47 complete ice-server signature verification 2016-02-22 18:00:05 -08:00
Stephen Birarda
9f9ef8764d add a note about the QDataStream black box 2016-02-22 15:32:59 -08:00
Stephen Birarda
11a1bc4488 add signed heartbeat sending to domain-server 2016-02-22 15:12:02 -08:00
Stephen Birarda
90e9089e85 repairs for storage of domain ID in AM accounts file 2016-02-22 13:23:01 -08:00
Stephen Birarda
e30b2b7051 generate new domain keypair on domain ID change 2016-02-22 10:28:32 -08:00
Stephen Birarda
837c4c0810 handle upload of domain public key to metaverse API 2016-02-19 16:55:12 -08:00
Stephen Birarda
fa5f2571d7 cleanup migrations from previous account file system 2016-02-19 16:31:31 -08:00
Stephen Birarda
98b06112bd handle persistence of AccountManager info to sep file 2016-02-19 15:45:20 -08:00
Stephen Birarda
af181e00b1 allow for creation of domain-server keypair in AccountManager 2016-02-19 14:34:19 -08:00
Brad Hefta-Gaub
c699c828cd Merge pull request #7092 from birarda/assets-abs-path 
add setting to DS for asset path, handle absolute paths
 2016-02-12 17:43:23 -08:00
Stephen Birarda
0f4467c582 cleanup exit codes for queued DS exit 2016-02-11 15:17:34 -08:00
Stephen Birarda
aaf8e60de3 delay critical quit messages until just prior to quit 2016-02-11 15:11:21 -08:00
Stephen Birarda
a089c43fdc don't send ice heartbeat with no ice-server socket 2016-02-11 14:07:05 -08:00
Ryan Huffman
811859e46f Update domain server to store temporary AC scripts in memory 2016-02-10 15:26:01 -08:00
James B. Pollack
3c9043987f Merge pull request #7019 from birarda/absolute-paths 
allow absolute path to entity-server persist file
 2016-02-04 08:53:21 -08:00
Stephen Birarda
9633e40c6e add code to remove old persistFilename setting 2016-02-02 15:15:19 -08:00
Stephen Birarda
13d58003be migrate persistFilename to persistFilePath in DS settings 2016-02-02 15:02:12 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Atlante45
9330c3d4f3 Fix DS assignment scripts responses 2016-01-22 16:04:38 -08:00
Atlante45
822244ef72 Fix DS new assignment feature 2016-01-22 13:37:19 -08:00
Brad Hefta-Gaub
58b7708315 Merge pull request #6899 from birarda/fix-go-home 
repairs to index path behaviour
 2016-01-21 21:29:24 -08:00
Stephen Birarda
9061e33a1f send path query once connected to domain 2016-01-21 18:24:17 -08:00
Stephen Birarda
15c922f4a5 always respond with default index path 2016-01-21 18:24:16 -08:00
Atlante45
db18d188b8 Fix wifi ping spikes 
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
 2016-01-21 15:05:32 -08:00
Stephen Birarda
0d80e9dc1f setup ice heartbeat if auto networking enabled 2016-01-19 16:42:57 -08:00
Stephen Birarda
74b2a44050 merge the master and user configs after a settings change 2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Stephen Birarda
a27d35566d stub of temporary name download on DS start 2016-01-19 10:49:18 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Ryan Huffman
a5eb54b1b7 Move DomainServer script location to app data directory 2016-01-15 10:36:09 -08:00
Ryan Huffman
4851def51c Add status HTTP server to AC Monitor 2016-01-08 10:35:04 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Clément Brisset
5d75fcbfce Merge pull request #6430 from birarda/unique_linked_data 
use a unique_ptr for linkedData in Node
 2015-11-20 15:01:41 -08:00
Stephen Birarda
b34934b849 resolve conflicts on merge with upstream/master 2015-11-20 11:52:53 -08:00
Stephen Birarda
3b40119992 use Agent session UUID to request script 2015-11-20 11:35:24 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
Stephen Birarda
3fba1f8445 better variable naming for nodeToKill 2015-11-18 17:46:32 -08:00
Stephen Birarda
f4cf1c0291 only broadcast removed node messages to interested nodes 2015-11-18 17:45:18 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub
034debc483 cleanup 2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub
40e69f6946 Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub
d42a1a721f first cut at messages-mixer 2015-11-16 15:26:17 -08:00
Stephen Birarda
584e35e4ab have killNodeWithUUID return success to avoid double lookup 2015-11-16 10:58:11 -08:00
Stephen Birarda
e52e9be44c re-broadcast disconnects from domain-server 2015-11-12 17:23:39 -08:00
Stephen Birarda
1c9396d66e handle disconnect request in domain-server 2015-11-12 15:43:03 -08:00
Stephen Birarda
6d99a822a3 use a case-insensitive search in allowed editors QStringList 2015-10-28 14:33:50 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Stephen Birarda
7987595dcd set the bearer poll timeout for wlan scan in Qt 5.5 2015-10-08 11:32:10 -07:00
Stephen Birarda
e835b5ccf3 remove old gnutls code from domain-server 2015-10-05 15:30:26 -07:00
Stephen Birarda
030404157e cleanup Assignment grab from iterator 2015-09-21 11:54:41 -07:00
Stephen Birarda
e21c1cb67c make sure server/mixers are first in FIFO 2015-09-21 11:51:53 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
0037a1f4a7 Win build fix 2015-09-11 14:21:55 +02:00
Atlante45
18a696d88c Type cleanup 2015-09-11 14:21:54 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Bennett Goble
6f4fc24fb6 NodeConnectionData QDataStream #include 2015-08-30 12:05:56 -04:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
1a019187af Merge branch 'ds-cleanup' into asset-upload 2015-08-26 15:07:43 -07:00
Stephen Birarda
cd7d0f383b allow editors who can't be verified in the short term 2015-08-26 15:07:29 -07:00
Stephen Birarda
4039c2e3e0 fix for asset-server naming, deadlock in timeout/wait 2015-08-26 14:27:12 -07:00
Stephen Birarda
352f3543c3 resolve conflicts on merge with ds-cleanup 2015-08-26 13:33:50 -07:00
Stephen Birarda
c8545c8aeb remove an empty line 2015-08-26 12:37:47 -07:00
Stephen Birarda
dc1f726283 don't assign the asset-server in domain by default 2015-08-26 12:36:48 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Ryan Huffman
4e3d0758e5 Remove UNUSED_2 2015-08-25 15:07:07 -07:00
Stephen Birarda
c776f04ab2 don't allow in a user who should have edit but not verified 2015-08-25 14:36:22 -07:00
Stephen Birarda
9940f375ea repairs for CR comments 2015-08-25 10:02:43 -07:00
Stephen Birarda
d02e5b2450 fix a typo in comment in DomainGatekeeper 2015-08-24 15:10:27 -07:00
Stephen Birarda
a9c04e5116 don't allow verified connection without username 2015-08-24 15:01:39 -07:00
Stephen Birarda
c6f1567361 add a debug for refused connection in DomainGatekeeper 2015-08-24 14:58:25 -07:00
Stephen Birarda
fe591f61cc fix class rename in processConnectRequestPacket 2015-08-24 14:54:48 -07:00
Stephen Birarda
d57c1fc2d5 fix a typo in DomainGatekeeper comment 2015-08-24 14:50:18 -07:00
Stephen Birarda
7591a29c48 add back indentation to STATICALLY_ASSIGNED_NODES 2015-08-24 14:44:24 -07:00
Stephen Birarda
d2acf327dd fix NodeConnectionData discrepancy on request 2015-08-24 14:43:49 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
Stephen Birarda
aac15e52bb add explicit cast to double for uptime 2015-08-20 10:19:34 -07:00
Stephen Birarda
74d6e5ba89 make sure LNL goes down before domain-server 2015-08-20 10:01:12 -07:00
Stephen Birarda
2738f65c10 have domain-server report non-skewed uptime 2015-08-19 18:23:11 -07:00
Ryan Huffman
da7c9198c5 Remove superfluous log message 2015-08-19 10:01:40 -07:00
Ryan Huffman
63d0205d1e Move domain settings retrieval to UDT 2015-08-18 23:11:33 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Leonardo Murillo
7c4813f1cf Another versioning checkpoint + cleanup 2015-08-13 16:35:55 -06:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Bennett Goble
d5691b1196 Add QDataStream include to DomainServerWebSessionData.cpp 
Fixes compilation error with Qt 5.5.0, QDataStream >> QSet
 2015-08-08 17:17:29 -04:00
bwent
ffccc9ca96 clean up formatting, make connectionUUID const in NodeList 2015-08-06 10:11:22 -07:00
bwent
73ea958640 add check if user is local user 2015-08-06 09:01:25 -07:00
bwent
a8f9f9d746 clean-up formatting 2015-08-05 17:43:03 -07:00
bwent
45e3eafce3 Remove ERR_get_error call 2015-08-05 16:00:25 -07:00
bwent
ab2b54a6b2 Add connection token to sign with username when connecting to domain-server 2015-08-05 15:33:59 -07:00
bwent
8868148c94 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-05 14:07:25 -07:00
bwent
fc385d9bc1 debugging 2015-08-05 10:29:30 -07:00
bwent
b9364a47a1 Debug null QUuid being stored in conenctionTokenHash 2015-08-04 15:31:26 -07:00
bwent
54dd5da64c To debug RSA padding error 2015-08-04 12:02:23 -07:00
bwent
af293ec6dd Fix DomainServerConnectionTOken packet writing/resetting 2015-08-04 12:02:23 -07:00
bwent
244cc016ab Generate session token UUIDs to be signed with username 2015-08-04 12:02:23 -07:00
Stephen Birarda
b68c7fd92a first adjustment in NLPacket after type is known 2015-07-23 16:59:08 -07:00
Stephen Birarda
9556fecbe2 initial changes to make _nodeSocket a udt::Socket 2015-07-20 17:10:22 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Atlante45
d505527e5a Remove setExtendedheader call 2015-07-17 15:38:36 -07:00
Stephen Birarda
8ff8a17f02 remove TODO added for DS, check sockets 2015-07-17 14:17:48 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Stephen Birarda
2a2eb39066 repairs for DS path query and response 2015-07-16 17:08:06 -07:00
Stephen Birarda
487969ef7a pack reason size as quint16 2015-07-16 16:45:16 -07:00
Stephen Birarda
f31675c4c6 fix ice-server packets 2015-07-16 14:21:37 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
ccc2649d26 fix packing of domain list header 2015-07-14 21:14:15 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
Stephen Birarda
a5ca1f7125 fix variable setup in Packet constructor 2015-07-14 19:15:18 -07:00
Atlante45
3abde577e2 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 16:58:26 -07:00