Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
87337 commits 29 branches 0 tags 1.1 GiB
Commit graph

2364 commits

Author SHA1 Message Date
Kalila L
2546639171 Add domain label creation step 1 of wizard. 2020-10-12 01:17:00 -04:00
Kalila L
2e75166e0d Hide temp place name button, hide places table, hide places wizard step. 2020-10-11 21:10:24 -04:00
kasenvr
35643e89f1
Merge pull request #546 from kasenvr/fix/domain-threading-defaults 
Enable automatic avatar and audio mixer threading defaults
 2020-10-08 22:46:40 -04:00
Kalila L
dc554bb8c6 Update some descriptions. 2020-10-07 19:37:10 -04:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs 2020-10-02 15:33:28 -04:00
Kalila L
ba67cc8254 Merge branch 'master' into fix/domain-threading-defaults 2020-10-02 15:28:31 -04:00
Kalila L
8cd129469b Update a few more links, not all links have endpoints though. 2020-09-28 04:47:21 -04:00
Dale Glass
125841afc9 Remove the HiFiAC codec 
This is a proprietary codec and it's uncertain who can use it, and
under what conditions. At this point, Opus is stable and a suitable
replacement.
 2020-09-27 20:17:15 +02:00
kasenvr
faadb9e340
Merge pull request #668 from kasenvr/fix/URL-migrations 
New Metaverse PR
 2020-09-26 01:21:17 -04:00
Kalila L
a90af38921 Fix badly formatted JSON metadata being sent to metaverse. 2020-09-25 20:55:43 -04:00
Kalila L
9e8dc88f63 Fix temporary place name assignment. 2020-09-24 18:06:39 -04:00
Kalila L
a965ac8591 Fix some weird context. 2020-09-24 17:30:15 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings 
Fix warnings emitted by GCC
 2020-09-24 17:06:16 -04:00
kasenvr
5e65319254
Merge branch 'master' into fix/domain-threading-defaults 2020-09-22 00:27:50 -04:00
Kalila L
d423b51e5f Change content.vircadia.com -> cdn-1.vircadia.com 2020-09-20 22:55:40 -04:00
Kalila L
bc1ffa8a8d Merge branch 'master' into fix/update-api-docs 2020-09-19 23:46:13 -04:00
Kalila L
f6ec13704b Copyright header updates. 2020-09-18 16:31:57 -04:00
Kalila L
1fad06b112 Update further. 2020-09-16 23:06:02 -04:00
Kalila L
23bf8388f1 Fix metaverse URL retrieval and comment out updatePlaceNameLink until we have our own functionality. 2020-09-16 21:37:48 -04:00
kasenvr
699425254d
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-16 19:59:44 -04:00
kasenvr
66f953d957
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-09-16 19:59:07 -04:00
Kalila L
c5a618be8f Fix indent...? 2020-09-15 21:09:39 -04:00
Kalila L
9b0ac9d75f Update endpoints to be consistent and work with the updates. 2020-09-15 21:05:00 -04:00
Kalila L
e3a6dc18af Add support for metaverse API's with paths. 2020-09-15 20:07:00 -04:00
Kalila L
dcbf8c7663 Agnostify language "High Fidelity" -> "Metaverse" and implement dynamic retrieval of URL for metaverse. 2020-09-15 01:31:24 -04:00
Kalila L
7a033f93da Add HTTP route to get metaverse info. 2020-09-15 00:54:52 -04:00
Kalila L
40219e6ff9 Merge branch 'master' into fix/domain-threading-defaults 2020-09-02 05:41:28 -04:00
kasenvr
e4a80a9931
Merge pull request #465 from kasenvr/feature/domain-metadata-exporter 
Domain Metadata Exporter
 2020-08-31 18:08:37 -04:00
Dale Glass
baa0fd34f4 Fix unsigned warnings 2020-08-27 19:48:27 +02:00
Kalila L
a513bba8c6 Update the domain-wizard to include threading options. 2020-08-24 22:52:18 -04:00
Kalila L
58bbab6b42 Merge remote-tracking branch 'origin/feature/domain-metadata-exporter' into fix/domain-threading-defaults 2020-08-24 19:43:26 -04:00
Kalila L
ab685838b0 Merge branch 'master' into fix/domain-threading-defaults 2020-08-24 19:43:04 -04:00
ArcadeFever
404e18296a changed url for AC script examples from HiFi to Vircadia github 2020-08-23 12:33:13 -07:00
Kalila L
ebecbcc7f7 Update JSON structure for metadata. 2020-08-21 22:00:06 -04:00
Kalila L
a24b8f0fc6 Missed a spot, was wiping thumbnail string and replacing with an array. 2020-08-21 14:08:50 -04:00
Kalila L
c81365f4f0 Update description for Prometheus exporter. 2020-08-21 13:47:59 -04:00
Kalila L
a079afbb73 Update metadata exporting. 2020-08-21 13:40:38 -04:00
Kasen IO
b7e4362553 Make empty values no longer null, add name property, rename "Hosts" -> "Managers" 2020-08-19 00:01:47 -04:00
Kasen IO
c70a041490 Merge branch 'master' into feature/domain-metadata-exporter 2020-08-18 21:35:51 -04:00
Heather Anderson
2e5244663e transition listener registration from member string name to member string pointer 2020-08-09 14:57:00 -07:00
David Rowe
81c402ab9c Code review 2020-08-06 21:40:36 +12:00
David Rowe
8f0b33b54d Miscellaneous tidying 2020-08-06 00:04:22 +12:00
David Rowe
13edfde89c Fix server settings 2020-08-05 23:46:15 +12:00
kasenvr
4d3ca2fdc5
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-05 02:31:10 -04:00
Kasen IO
448cdcb31f Update domain's describe-settings for clarity. 2020-08-05 00:23:55 -04:00
David Rowe
dfef1fb5bb Remove unused domain server setting 2020-08-04 22:03:08 +12:00
David Rowe
6f9b47c07d Distinguish domain groups with a leading "@" 2020-08-04 21:31:13 +12:00
David Rowe
60048162c0 Use WordPress user roles as domain groups 2020-08-04 21:00:09 +12:00
David Rowe
bc56eb5ac7 Update to work with WordPress plugin 2020-08-04 17:12:31 +12:00
David Rowe
7da91d9557 Misc. tidying 2020-08-04 09:15:05 +12:00
David Rowe
257eadc99f "Unable connect to this domain" message box after login if can't connect 2020-08-03 16:12:13 +12:00
David Rowe
0b42ef5748 Regularize domain username case 2020-08-03 13:21:20 +12:00
David Rowe
26e6ce07d7 Further networking tidying 2020-08-03 11:26:11 +12:00
David Rowe
43b6e77235 Tidy networking code 2020-08-03 09:17:12 +12:00
David Rowe
dfbad4efc0 Use "enable domain authentication" server setting 2020-08-02 21:22:59 +12:00
David Rowe
fdb4a5605a Tidy processing user connect request 2020-08-02 20:54:09 +12:00
David Rowe
c3769a5f74 Get WordPress API path from domain server settings 2020-08-02 17:33:13 +12:00
David Rowe
8cdd76a42e Verify user at domain server 2020-08-02 16:17:04 +12:00
David Rowe
15c6baceb8 Send OAuth2 username and tokens to domain server 2020-08-01 18:57:21 +12:00
David Rowe
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
David Rowe
c3d248a404 Merge branch 'oauth2-wordpress' into feature/oauth2-login 2020-07-31 15:20:32 +12:00
Kasen IO
af34536a09 Further complete the loop. 2020-07-30 00:34:02 -04:00
David Rowe
7c8993b34f Add TODO 2020-07-29 10:03:44 +12:00
David Rowe
d5e189422f Support blacklisting per domain groups 2020-07-29 08:08:08 +12:00
David Rowe
94908fd1a7 Add support for group lists in domain server 2020-07-28 22:05:40 +12:00
David Rowe
429b4ceefa Flesh out domain groups code 2020-07-28 21:23:55 +12:00
Kasen IO
294646a141 Add OAuth2 to domain settings. 2020-07-27 23:04:59 -04:00
David Rowe
34eb74ac00 Update copyrights 2020-07-25 16:26:57 +12:00
David Rowe
82252cdc08 Get basics working 2020-07-25 16:22:52 +12:00
David Rowe
d923936854 Merge branch 'master' into feature/oauth2-master-update 2020-07-25 10:06:18 +12:00
David Rowe
0b667e34a2 Regularize naming 2020-07-24 22:02:23 +12:00
David Rowe
6d310eb999 Generate "NotAuthorizedDomain" condition 2020-07-24 21:22:00 +12:00
David Rowe
9b13f0bebb Merge branch 'feature/oauth2-groups' into feature/oauth2-login-required 2020-07-24 11:14:47 +12:00
David Rowe
2e9355da58 Distinguish not logged into metaverse vs domain 2020-07-24 11:13:41 +12:00
Kasen IO
d3320ab17b Separate domain vs metaverse login denials for Interface. 2020-07-23 00:18:04 -04:00
David Rowe
e4c9657ab9 Initial auxiliary groups code 2020-07-23 16:08:09 +12:00
kasenvr
eef1e3b93e
Update index.html 2020-07-21 01:30:56 -04:00
Kasen IO
e8d9fe852e Adjust lines for length. 2020-07-21 00:49:14 -04:00
kasenvr
1c545dffca
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-20 14:25:52 -04:00
Kasen IO
1ea78c6ab5 Enable automatic avatar and audio mixer threading defaults 2020-07-17 05:22:59 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Kasen IO
f1d731da11 Add users to the export. 2020-06-30 00:25:27 -04:00
Kasen IO
6129981459 Merge branch 'master' into feature/domain-metadata-exporter 2020-06-29 23:26:14 -04:00
David Rowe
a78bd7025f Improve wording of get/set privateUserData description 2020-06-28 11:04:59 +12:00
motofckr9k
7b34872b81 Replace domain-server favicon 2020-06-21 03:59:33 +02:00
kasenvr
63e3c001c3
Merge pull request #411 from Misterblue/fix/central-metaverse-urls 
Move metaverse server URL info into central files for easier updating
 2020-06-18 17:23:05 -04:00
Kasen IO
f712fc7735 Export to JSON, JSON formatting. 2020-06-18 16:43:59 -04:00
HifiExperiments
1da1dd20c3 try to fix crash 2020-06-17 20:18:05 -07:00
HifiExperiments
8052259489 get domainmetadata stuff compiling 2020-06-17 17:47:50 -07:00
Kasen IO
19ff5bfd4f uno error. 2020-06-16 00:53:06 -04:00
Kasen IO
269f0ac600 Latest condition. 2020-06-15 23:49:54 -04:00
Kasen IO
7c264e7d85 First pass at adding domain metadata exporter. 2020-06-15 22:51:51 -04:00
Robert Adams
3878ad6df6 Move metaverse server URL info into NetworkingConstants.h (for C++ 
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
    references to the new central definitions.
 2020-06-13 07:04:58 -07:00
Dale Glass
fd59665e63 Add missing Prometheus stats to type map 2020-06-11 22:23:27 +02:00
Dale Glass
b2a5e7fdd1 Additional review fixes 2020-06-08 17:53:27 +02:00
Dale Glass
172ae45420 Another variable renaming 2020-06-07 02:47:39 +02:00
Dale Glass
45f1640b5a Remove useless code 2020-06-07 02:47:39 +02:00
Dale Glass
c0a0d39ce5 More style fixes 2020-06-07 02:47:39 +02:00
Dale Glass
9e478ba458 More variable renaming 2020-06-07 02:47:39 +02:00
Dale Glass
01b0317348 Add missing gauges 2020-06-07 02:47:39 +02:00
Dale Glass
303f10dada Review fixes 2020-06-07 02:47:39 +02:00
Dale Glass
da5e4d3cfc Review fixes 2020-06-07 02:47:39 +02:00
Dale Glass
bc40bc5e52 Update stats backlist for the exporter 2020-06-07 02:47:39 +02:00
Dale Glass
443d769eac Make it possible to turn the Prometheus exporter on and off 
The settings are available from the domain settings page.
 2020-06-07 02:47:39 +02:00
Dale Glass
a8bd627cda Add Prometheus exporter 
Exports domain statistics for the domain on port 9703 (officially reserved)
 2020-06-07 02:47:39 +02:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
335f0c86dd Reduce scope of PR. 2020-05-17 22:13:57 -04:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
Thijs Wenker
dcb575a178
Merge pull request #86 from MarcusLlewellyn/opus-plugin 
Add support for the Opus audio plugin.
 2020-01-31 01:04:47 +01:00
Dale Glass
e396747377 Add Opus to list of codecs 2020-01-09 16:43:12 +01:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Zach Fox
2b7d66c710 Slight optimization; comments 2019-12-06 10:32:45 -08:00
Zach Fox
c96c684400 Initial path to fixing screenshare auth race condition 2019-12-05 15:47:43 -08:00
Howard Stearns
323007eb2c ignore anonymous screenshare zone entry 2019-11-26 12:11:38 -08:00
Zach Fox
8aea0dd951 Merge in Howard's 'screenshare presence' open PR 2019-11-13 10:11:16 -08:00
Shannon Romano
24dc4b19ae
Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging 
DEV-2292: Alerting requirements for domain-server failure cases
 2019-10-04 14:01:56 -07:00
Shannon Romano
15394f7a6b
Merge pull request #16284 from roxanneskelly/dev653 
DEV-653 - give warning not to change address for cloud domains
 2019-10-04 11:54:30 -07:00
Simon Walton
db14cdbd22 Tweak 'critical' status for some logging 2019-10-04 09:56:35 -07:00
Simon Walton
d5d1c08da0 Adjust some of the logging 2019-10-03 16:50:24 -07:00
Roxanne Skelly
38afa6b5c2 Move to correct place 2019-10-03 16:47:09 -07:00
Roxanne Skelly
8940d990ec DEV-2044 - add notification that temporary domains won't show up in 
domain list
 2019-10-03 16:17:08 -07:00
Simon Walton
b458098409 Add case of failure to update ICE with metaverse 2019-10-03 12:38:29 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
Roxanne Skelly
04f13cd17e DEV-653 - give warning not to change address for cloud domains 2019-10-03 12:05:10 -07:00
Clement
0401015441 Connect aboutToQuit 2019-09-30 15:18:47 -07:00
Atlante45
a4c857315a Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
Roxanne Skelly
434c63b7e3 BUGZ-1381 - domain server creates blank/undefined group when adding 
groups
 2019-09-25 14:14:29 -07:00
Clement
1ca30b688d Put flush timer on right thread without parenting 2019-09-20 15:39:35 -07:00
Clement
527b27b32d Make sure the flush timer is not spawned too early 2019-09-18 17:05:05 -07:00
Roxanne Skelly
9a7de10614 set file permissions on the config.json file for the domain server 2019-09-11 16:27:00 -07:00
Roxanne Skelly
0f242deaf2 fix crash and some UI issues 2019-09-11 14:11:43 -07:00
Roxanne Skelly
a0ad1f3a68 DEV-444 - OAuth administration improvements 2019-09-10 17:27:23 -07:00
Howard Stearns
5ff0c5800e do not unzip or parse entities-backup on message thread 2019-08-29 12:56:14 -07:00
Roxanne Skelly
de1aa68cff oopse 2019-07-30 11:30:23 -07:00
Roxanne Skelly
b4fee1140c BUGZ-319 - Add 'Installed By' username to installed content section on 
settings.
 2019-07-29 16:25:51 -07:00
Roxanne Skelly
701c457ad4 Fix issue where reset of server was prematurely causing the drop of 
an ajax connection which was causing an error popup.
 2019-07-26 16:57:05 -07:00
Roxanne Skelly
03b146cfb2 fix issue with .json.gz files failing to upload properly 2019-07-26 13:55:59 -07:00
Roxanne Skelly
908cb8156b fix coding standards issue 2019-07-26 09:40:17 -07:00
Roxanne Skelly
b770ff7b79 BUGZ-829 - error handling for web uploaded model files 2019-07-25 18:14:11 -07:00
Roxanne Skelly
130e68c9b5 DEV-168 - make interface-installed content sets display info on web 
installed content section
 2019-07-25 14:37:41 -07:00
Roxanne Skelly
22e71115dd DEV-168 - add filename reporting for installed/restored backup content 2019-07-25 11:46:05 -07:00
Roxanne Skelly
5afae43051 CR fix 2019-07-24 16:05:34 -07:00
Roxanne Skelly
fe4334d6c4 BUGZ-829 fix a few nits 2019-07-24 15:33:13 -07:00
Roxanne Skelly
783c61500e BUGZ-829 DEV-168 - domain backup/content management improvements 
BUGZ-829 - improve error reporting during restore of content

DEV-168 - show last installed archive information
 2019-07-24 12:52:06 -07:00
Howard Stearns
335119cb58 log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
Roxanne Skelly
c5883a8d67 CR fixes 2019-06-24 14:58:06 -07:00
Roxanne Skelly
e39ccff873 BUGZ-812 - Log system info on domain connect or connect refusal 2019-06-24 11:59:57 -07:00
Roxanne Skelly
0576e6ae3e remove newline for sysinfo to make splunk queries easier 2019-06-19 15:10:02 -07:00
Roxanne Skelly
2ed5e8aefb add OS type to connect message 2019-06-19 13:53:38 -07:00
Simon Walton
b95515933f
Merge pull request #15708 from SimonWalton-HiFi/stun-on-iface-change 
Force new IP port on local address change
 2019-06-19 10:12:36 -07:00
Simon Walton
cfcea359b2 Handle local address changes for servers 2019-06-14 16:51:59 -07:00
Roxanne Skelly
1b31b8cff8 CR fixes 2019-06-14 13:23:33 -07:00
Roxanne Skelly
5b6911efa4 log username with "haven't heard from" messages 
remove rebind on silent domain checkin
 2019-06-14 10:45:18 -07:00
Roxanne Skelly
6e6bd18baa Undo Visual Studio mis-formatting 2019-06-12 11:43:43 -07:00
Roxanne Skelly
67cb5821bc Update packet headers / add connect 'reason' 2019-06-11 16:00:49 -07:00
Roxanne Skelly
3c9edb90d8 Log formatting fix 2019-06-11 15:35:50 -07:00
Roxanne Skelly
ec91f4dae4 More checkpoint MTBF logging 2019-06-11 14:37:46 -07:00
Roxanne Skelly
8a3672f3c5 Checkpoint MTBF uptime reporting 2019-06-11 12:41:45 -07:00
Roxanne Skelly
73e3ad7e4c Monitor traffic from nodes and report if not heard from in over 2 sec 
Also, remove spammy backup logging.
 2019-06-04 11:16:36 -07:00
Roxanne Skelly
4d8607a937 linux build issue 2019-05-30 14:54:54 -07:00
Roxanne Skelly
e12ed1c5d6 high_resolution_clock behaves differently on windows and linux 
on linux, time_since_epoch returns time since linux epoch,
on windows, it returns time since system start.
Math between those values on two different types of machines
was coming out bad.
 2019-05-30 14:17:19 -07:00
Roxanne Skelly
41be22a7bb ubuntu build fix and CR fix 2019-05-24 15:22:33 -07:00
Roxanne Skelly
c6de86a80c Log packet processing time for domain server list request packets 2019-05-24 14:52:55 -07:00
Roxanne Skelly
1c6cf3df0d Move DomainList timestamps to the extended header 
And. Lag notifications now use signed values
 2019-05-23 14:19:36 -07:00
Roxanne Skelly
4f1eeecc2f Revert "Merge pull request #15620 from highfidelity/revert-15612-domaincheckin" 
This reverts commit 4735b9f19a, reversing
changes made to bc4a88beb7.
 2019-05-23 11:00:43 -07:00
Howard Stearns
a71e902a49
Revert "BUGZ-322 - add domain checkin lag logging" 2019-05-23 10:27:05 -07:00
Roxanne Skelly
b331bb0683 Initialize structure member as per code review suggestion. 2019-05-22 15:03:39 -07:00
Roxanne Skelly
4ca77ba3ac BUGZ-322 - add domain checkin lag logging 2019-05-22 13:51:43 -07:00
Shannon Romano
b5f23f550f
Merge pull request #14519 from MattHardcastle/use-qsavefile 
Use QSaveFile when persisting domain settings to disk
 2019-05-15 13:41:34 -07:00
Zach Fox
e87381f431 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-13 14:13:34 -07:00
Zach Fox
55138ed088 CR feedback 2019-05-13 14:12:51 -07:00
Clement
c691ee496e CR 2019-05-09 13:58:50 -07:00
Clement
5c42838261 Change timeouts to try to prevent ICE disconnects 2019-05-08 18:38:35 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
Zach Fox
d53b528994 Some fixes - i don't think this code is complete 2019-05-06 13:38:09 -07:00
Zach Fox
2046fcfd09 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-06 11:08:36 -07:00
Zach Fox
d0e5087b20 Add permission 2019-05-06 10:19:58 -07:00
Shannon Romano
827cab7f1b
Merge pull request #15483 from SimonWalton-HiFi/set-connection-rate-high 
22431: Set default avatar-mixer connection rate to effectively unlimited
 2019-05-06 08:01:57 -07:00
Simon Walton
a0fd828ef7 Set default av-mixer connection-rate to 1e7 2019-04-30 16:00:35 -07:00
David Kelly
5554b0bf2c There is no anon restriction - only open, hifi, acl 2019-04-25 13:53:00 -07:00
Shannon Romano
5d1c1010c5
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error 
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
 2019-04-17 11:43:12 -07:00
Roxanne Skelly
629d5e50ff CR Fix 2019-04-05 16:16:34 -07:00
Roxanne Skelly
9888f5feda Copy Pasta 2019-04-05 16:02:09 -07:00
Roxanne Skelly
a63171fb94 Case22025 - Show 'create temporary place' button when no places are present 
The metaverse urls were hard-coded to be production.  Fix is to pull them
from the domain server, which will pull them from the environment variable.
 2019-04-05 14:54:02 -07:00
Seth Alves
cbc51b75f9 fix asan reported error when returning QString reference to refreshGroupsCache 2019-04-04 19:55:13 -07:00
Roxanne Skelly
75671be2de Case 22025 - Create temporary placename doesn't appear when no places are listed 2019-04-03 13:57:37 -07:00
Roxanne Skelly
2d71ec1c75 Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set 
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
 2019-04-02 13:19:06 -07:00
Shannon Romano
6ccf16dfe5
Merge pull request #15288 from roxanneskelly/Case21726 
Case 21726 - Domain lost recent entity edits upon restart
 2019-03-29 17:06:31 -07:00
Roxanne Skelly
88b7687183 Case 21726 - Domain lost recent entity edits upon restart 
When an entity server starts up, grabs the version of the models.json
file locally, and then queries the domain server for its copy of the
models.json file...iff the domain server version is newer.

There was a bug in this process in that the comparison was made between
the wrong version, specifically the 'file format version' which doesn't
change unless there was a protocol change...and not the data version,
which increments every time a change is made to a domain.

Therefore, the version of the models.json on the domain server was never
downloaded to the entity server, even when it was newer.

It would be newer if the entity server assignment was moved to a machine
with an old version of the models.json file, which was in fact the case
on distributed3 during this period of time.
 2019-03-28 13:19:16 -07:00
Simon Walton
a1660dad95 Follow dynamic updates to hero zones; make reserved fraction a domain setting 2019-03-22 12:30:49 -07:00
Roxanne Skelly
38981a5f25 Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36' 2019-03-05 15:08:39 -08:00
Shannon Romano
0f0ed0fbc4
Merge pull request #15007 from Atlante45/fix/kick-bug-master 
Case 21402: Don't send a KillAvatar packet on kick
 2019-02-28 12:26:30 -08:00
Clement
717c12fe16 Add new connection rate limitting 
Limit rate of connection for new Agents
 2019-02-27 18:22:49 -08:00
Clement
d3b3dfd76d Don't send a KillAvatar packet on kick 
The DS already takes cares of removing nodes no longer allowed when
the permissions are updated and KillAvatar was never meant to be used
from the DS.
 2019-02-25 09:47:55 -08:00
Clement
d27d624c3f Don't send a KillAvatar packet on kick 
The DS already takes cares of removing nodes no longer allowed when
the permissions are updated and KillAvatar was never meant to be used
from the DS.
 2019-02-25 09:47:35 -08:00
David Kelly
2202b69575 Guard against accidentally calling wrong api/v1/places endpoint 
spaces
 2019-02-20 13:09:29 -07:00
Clement
95714b7eb3 Add failed backup as corrupted during creation 2019-01-24 16:11:38 -08:00
Matt Hardcastle
f4b6db5def Use QSaveFile when persisting domain settings to disk 
Prior to this change the `DomainServerSettingsManager::persistToFile()`
method wrote directly to the settings file. It also did limited error
checking. These limitations could lead to a situation where a crashed
domain-server process, a file system backup, a settings file copy, or a
hardware error could corrupt the setting file.

This change swaps the `QFile` class for `QSaveFile` and uses its atomic
saving features, which writes the changes to the settings file to a file
in the same directory as the settings file and then does a rename to
replace the original. If the rename, or any of the file operations, fail
the original settings file remains in place.
 2019-01-02 10:03:07 -08:00
Simon Walton
9e2b3fe820 Remove out-of-date backups on startup as well as on rule-evaluation 2018-12-17 11:39:58 -08:00