Commit Graph

54 Commits (707eb8de8284c1f3e27565a0dff99ed1563b42ee)

Author SHA1 Message Date
UbitUmarov 707eb8de82 remove more xml things no longer needed on .net >4.5.2 2018-01-17 07:17:24 +00:00
UbitUmarov 029d6e40f6 remove those xml things no longer needed on .net >4.5.2 2018-01-17 04:18:43 +00:00
UbitUmarov e908c0ecad give up on a property that old monos do compile, but then smore ok exec 2018-01-09 19:47:10 +00:00
UbitUmarov eec3921800 fall back to a obsolete property since several monos in use (include our own) do not suporte the proper .net4.0 one 2018-01-08 12:00:21 +00:00
UbitUmarov 89a690c11f a few more xml things 2018-01-05 12:24:07 +00:00
Melanie Thielker b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov 5c39d9790e change vivox url from https:// to http:// still another 2015-12-11 19:50:22 +00:00
UbitUmarov 6ea43d6014 change vivox url from https:// to http:// missed several 2015-12-11 19:48:50 +00:00
UbitUmarov b63a7d7705 change vivox url from https:// to http:// (merge issue) 2015-12-11 19:44:42 +00:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Melanie Thielker 80118ac057 Remove braindead "fix" that messed up intersim scripted giving. 2014-11-21 04:00:52 +01:00
Melanie Thielker 30f3de549a Merge branch 'avination-current' 2014-10-30 01:32:36 +01:00
Melanie Thielker 27b70c3fce Fix a potential nullref in Vivox 2014-10-30 01:29:22 +01:00
Melanie Thielker 159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
Oren Hurvitz 998d7009a6 Eliminated many warnings 2014-04-23 16:37:36 +03:00
Melanie Thielker 075cf2baa3 Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels 2014-03-25 03:17:04 +01:00
Melanie 3589acdab1 Merge branch 'master' into careminster
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc) 7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
Melanie bf283208df Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
Diva Canto 428916a64d Commented out ChatSessionRequest capability in Vivox and Freeswitch. We aren't processing it in any meaningful way, and it seems to get invoked everytime someone types a message in group chat. 2013-07-26 21:14:21 -07:00
Melanie 648e258b8e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
Justin Clark-Casey (justincc) 12a3b85561 Fix passing of voice distance attenuation to the Vivox voice server.
Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance)
Thanks to Ai Austin for spotting this.
2013-05-30 22:20:02 +01:00
Melanie 669fa3ff9a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
Diva Canto 7e1c7f54c7 First change in Vivox for ages! -- added a lock to serialize calls to vivox servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox. 2013-05-28 20:59:25 -07:00
Melanie 578174d21c Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc) 80c19b7cac Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already. 2013-02-27 00:21:02 +00:00
Melanie 06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto 18c5d33f0a All optional modules' directives moved out of addin.xml 2012-11-13 09:48:56 -08:00
Diva Canto 91a5c602e3 Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."
But the patch is here, in case anyone wants to try it.

This reverts commit 531edd51d8.
2012-09-30 07:48:03 -07:00
Diva Canto 531edd51d8 Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow.
Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
2012-09-30 07:22:55 -07:00
Melanie 0d97beefce Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
SignpostMarv e041f09750 refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3 2012-09-08 00:44:27 +01:00
Melanie 5ac77316e0 Remove XML debug spam from vivox voice 2012-08-16 00:59:58 +02:00
Melanie 31ab8b2fe0 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc) 231a3bf147 Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
Melanie b519cf6383 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Client/IClientInventory.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
Justin Clark-Casey (justincc) b74a89bc12 minor: clean up some code formatting in VivoxVoiceModule.cs 2012-03-27 22:33:42 +01:00
Justin Clark-Casey (justincc) 4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
Melanie bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie 15e0b55e66 Merge branch 'master' into careminster-presence-refactor 2011-04-03 14:16:28 +01:00
Justin Clark-Casey (justincc) 4f56c732bc Comment out some startup logging lines to make up for the one I added earlier on.
Most of these are where the region modules are telling us they are disabled.  Convention is only to log when enabled (even that is really noisy)
2011-04-02 02:29:42 +01:00
Melanie 5ef490b5ad Switching vivox to https for production use 2011-03-25 01:10:41 +01:00
Diva Canto c5ea783526 OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. 2010-01-11 07:51:33 -08:00
Jeff Ames ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Melanie eba23048ca Replace the Replaceable modules name 2009-08-10 23:08:22 +01:00
Teravus Ovares 64bd9a3354 * Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list 
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
2009-07-25 15:49:10 +00:00
Jeff Ames a133e83f3a Formatting cleanup. 2009-07-23 15:32:11 +00:00
Adam Frisby 71ab7a1e2d * Workaround for a bug in Vivox Server r2978, whereby channel-search.channels.count returns 0 instead of the actual channel count. Should not affect more recent versions of Vivox where this issue has been fixed. 2009-07-12 02:16:49 +00:00
Adam Frisby 50ccf914ca * More Vivox Fiddling 2009-07-12 01:56:38 +00:00
Adam Frisby a8b40d47d6 * Patch for previous revision. 2009-07-12 01:31:33 +00:00