aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoiceclient.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-301-9/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same. Conflicts: .gitignore linden/indra/develop.py linden/indra/llcommon/llsdserialize_xml.cpp linden/indra/newview/CMakeLists.txt Manually combined MOAP, OTR, and WL changes from both. linden/indra/newview/app_settings/default_grids.xml Manually merged the grid collection. Also updated IG info. linden/indra/newview/hippoupdate.cpp linden/indra/newview/llettherebelight.cpp Just used the Imprudence copy. linden/indra/newview/llviewermessage.cpp Keep unbranding. linden/indra/newview/llvoavatar.cpp Manually merge client tags. linden/indra/newview/res/viewerRes.rc Manually merge version from Impy. linden/indra/newview/skins/dark/colors_base.xml Keep unbranding. linden/indra/newview/skins/default/html/unabletoconnect.png linden/indra/newview/skins/default/textures/icon_top_pick.tga linden/indra/newview/skins/default/xui/en-us/floater_about.xml Manual merging of contributors. linden/indra/newview/skins/gemini/colors_base.xml Keep unbranding. linden/indra/newview/skins/gemini/textures/icon_top_pick.tga linden/indra/newview/viewer_manifest.py Manually merged boost, gstreamer, OTR, and name. linden/indra/newview/viewerinfo.cpp Manually merge the comment.
| * Delete a big bunch of unused variables.David Walter Seikel2013-04-081-9/+1
| |
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2012-02-201-0/+12
|\ \ | |/ | | | | | | | | | | | | Conflicts: linden/indra/newview/installers/windows/meta-impy_installer_template.iss Branding conflict, fixed. linden/indra/newview/llviewerwindow.cpp Already had this change, but merged the minor difference.
| * Merge remote-tracking branch 'armin/next' into nextMcCabe Maxsted2012-02-181-5/+26
| |\
| | * disable voice if ParcelVoiceInfoRequest response is malformed.Armin Weatherwax2011-12-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seen (empty LLSD) in OSGrid Mumble Sandbox. Without a "voice_credentials" key the client never connects to the server, but would retry in vain to do so. Note to OpenSim devs: the "channel_uri" of the ParcelVoiceInfoRequest response is parsed to identify if we are connecting to a mumble server on parcel change. The presence of "sip:" within the uri is interpreted as connecting to vivox/freeswitch, the absence as connecting to a mumble server. However it would be much better to add a "server_type" key to the response, which could hold a string like "mumble", "freeswitch", etc - the absence would indicate connecting to a legacy(like) voice server. Additional note: to detect a mumble server also of the VoiceAccountProvision response the voice_account_server_uri is parsed: If the uri starts with tcp:// the "mumble" client is loaded(by default, you can change it in the "VoiceModuleMumble" debug setting), for any other scheme "SLVoice" (default, "VoiceModuleVivox" debug setting).
* | | Merge branch 'next' of git://github.com/ArminW/imprudence into nextDavid Walter Seikel2011-12-051-5/+14
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py Conflicted with the OTR stuff, simple fix.
| * | improve the voiceclient shutdown a bitArmin Weatherwax2011-11-131-5/+14
| | |
* | | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2011-12-031-0/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious. Conflicts: .gitignore linden/indra/cmake/00-Common.cmake linden/indra/newview/llvoavatar.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerinfo.cpp The usual branding conflicts.
| * | Fixed vivox license appearing when enabling voice on opensimMcCabe Maxsted2011-10-171-0/+12
| |/
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-041-321/+484
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manually merged): linden/indra/llcommon/llversionviewer.h linden/indra/llvfs/lldir.cpp linden/indra/llvfs/lldir_mac.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/Info-meta-impy.plist linden/indra/newview/llappviewer.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/packaging/mac/Info.plist.in linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerversion.cpp linden/indra/newview/viewerversion.h linden/install.xml Also some post merge tweaks.
| * fix an edge case when voice didn't kick in; fix reconnect to voice not workingArmin Weatherwax2011-06-011-51/+73
| |
| * revamp the voice client.Armin Weatherwax2011-05-221-290/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * split the "voice" debug tag into several tags for usable filtering while debugging * remove debug-spam from user view by: * remove capability request spam by: * llstartup the voice client state engine when actually a region is present, and not the initial fake region. * don't request a capability to determine if (the very same) capability can be requested. * don't do it over and over as if a capability rezzed in like an avatar. Its available - or not (see llstartup). * unload the daemon if not used. * load vivox daemon depending on specific criteria in the caps * remove the partial implementation to load a specific daemon with via the openregion message or the login response. * discard obsolete caps. Tested and working on linux: Parcel changing, region changing, (SL) voice-disabled region private call, (SL) private call region changing, (OS) no voice <-> voice region changing, (OS) mumble <-> freeswitch region changing. To test: Mac, Win. Anything that needs to be tested and not mentioned above.
* | Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-031-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * fix: voice always on, even if told not to beArmin Weatherwax2011-03-201-1/+3
| | | | | | | | introduced by 56bf45f >_>
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-18/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * fix voice doesn't kick in.Armin Weatherwax2011-03-131-12/+10
| | | | | | | | also fixed some LL_INFOS that should be LL_WARNS in the voice client.
| * Revolution Smythe: load voice module depending on login responseArmin Weatherwax2011-03-011-6/+17
| |
* | Unbranding. Todays word is "linden".David Seikel2011-02-251-3/+3
|/
* IMP-590: Added a thread-safe and robust wrapper for APR pools.Aleric Inglewood2010-11-171-1/+1
| | | | See http://redmine.imprudenceviewer.org/issues/590
* Applied patch by Makomk Makosen for #515: Uninitialized pointer ↵McCabe Maxsted2010-09-111-0/+1
| | | | mNextAudioSession in LLVoiceClient
* Added 'Reset Voice' button to Preferences > Voice from EmeraldMcCabe Maxsted2010-08-121-2/+2
|
* Fixed #381: using voice causes viewer crash on disconnect/quitMcCabe Maxsted2010-08-121-3/+3
|
* Revert "disable voice temporaryly where no caps avail (renables on parcel ↵Jacek Antonelli2010-05-081-61/+32
| | | | | | | | | change)" It could potentially have unintended consequences for private voice conversations. This reverts commit f6ed529f2237975fb9a205cc6340a7159e44a404.
* disable speakers button and hide floateractivespeakers if voice not enabled.Armin Weatherwax2010-05-041-1/+1
|
* disable voice temporaryly where no caps avail (renables on parcel change)Armin Weatherwax2010-05-041-32/+61
|
* disable voice (for the session) if binary not foundArmin Weatherwax2010-04-121-0/+1
|
* despam voice client: no ProvisionVoiceAccountRequest capabilityArmin Weatherwax2010-04-121-2/+2
|
* Fixed log spam about missing ParcelVoiceInfoRequest capability.Armin Weatherwax2010-01-021-1/+14
| | | | | | | SNOW-66 fix by Armin. SNOW-250 fix by Pixel Gausman and Aleric Inglewood. (Cherry picked by Jacek from 3a84d801)
* Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-38/+263
|
* Second Life viewer sources 1.22.10-RCJacek Antonelli2009-03-011-91/+89
|
* Second Life viewer sources 1.22.8-RCJacek Antonelli2009-02-121-957/+3583
|
* Second Life viewer sources 1.22.6-RCJacek Antonelli2009-01-281-0/+2
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.21.2-RCJacek Antonelli2008-09-121-15/+26
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-53/+124
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-151-118/+131
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-46/+6
|
* Second Life viewer sources 1.19.1.4Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-3/+23
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-78/+124
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-151-6/+6
|
* Second Life viewer sources 1.18.5.0-RCJacek Antonelli2008-08-151-2/+4
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-2/+5
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.2.0Jacek Antonelli2008-08-151-0/+4
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-151-0/+4076
generated by cgit v1.1 at 2024-11-15 16:51:14 +0000