aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-271-7/+5
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-271-7/+5
| | | | | | | | places where we were not already.
* | Merge branch 'master' into careminsterMelanie2012-11-151-0/+2
|\ \ | |/
| * All optional modules' directives moved out of addin.xmlDiva Canto2012-11-131-0/+2
| |
| * Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-1/+0
| | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-0/+1
| | | | | | | | | | | | 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
* | Merge branch 'master' into careminsterMelanie2012-09-091-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵SignpostMarv2012-09-081-1/+1
| | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
* | Remove XML debug spam from vivox voiceMelanie2012-08-161-12/+12
| |
* | Merge branch 'master' into careminsterMelanie2012-05-051-24/+30
|\ \ | |/ | | | | | | | | | | | | | | 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
| * Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-031-24/+30
| | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-03-281-46/+24
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * minor: clean up some code formatting in VivoxVoiceModule.csJustin Clark-Casey (justincc)2012-03-271-54/+25
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-051-3/+3
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-3/+3
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-031-8/+0
|\ \ | |/
| * Comment out some startup logging lines to make up for the one I added ↵Justin Clark-Casey (justincc)2011-04-021-8/+0
| | | | | | | | | | | | 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)
* | Switching vivox to https for production useMelanie2011-03-251-11/+11
|/
* OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.Diva Canto2010-01-111-1/+1
|
* Formatting cleanup.Jeff Ames2009-10-011-2/+2
|
* Replace the Replaceable modules nameMelanie2009-08-101-1/+1
|
* * Updates libOMV to version 0.7.0Teravus Ovares2009-07-251-2/+2
| | | | | | | | * 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
* Formatting cleanup.Jeff Ames2009-07-231-2/+2
|
* * Workaround for a bug in Vivox Server r2978, whereby ↵Adam Frisby2009-07-121-2/+18
| | | | 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.
* * More Vivox FiddlingAdam Frisby2009-07-121-1/+5
|
* * Patch for previous revision.Adam Frisby2009-07-121-4/+1
|
* * More VivoxModule debugging.Adam Frisby2009-07-121-2/+20
|
* * Added some noisy debug information to VivoxModule to try debug why ↵Adam Frisby2009-07-121-2/+9
| | | | GetChannel fails on LBSA/Zaius Plaza.
* fixing missing ReplacableInterfaceDr Scofield2009-07-111-2/+7
|
* From: Dr Scofield <hud@zurich.ibm.com> & Alan Webb <alan_webb@us.ibm.com>Dr Scofield2009-07-111-0/+1301
this commit finally adds the VivoxVoiceModule: it supports positional as well as conference call type voice (currently only per region server), region and parcel voice, speaker indication (LL client family), direct avtar-to-avatar voice chat. NOTE: you need to obtain an customer admin account from Vivox to be able to use this module --- DON'T ask me about how to about an admin account, i've NO clue, we just wrote this code.