Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -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.cs | Justin Clark-Casey (justincc) | 2012-03-27 | 1 | -54/+25 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Fix: get embedded objects from Notecard fails with activated ↵ | PixelTomsen | 2012-02-14 | 1 | -3/+3 |
| | | | | | | | | | | | | FreeSwitchVoiceModul http://opensimulator.org/mantis/view.php?id=2607 | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 2 | -6/+6 |
|\ \ | |/ | |||||
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | 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-refactor | root | 2011-06-30 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Tell hypergridders when their teleports fail because of the 4096 limit ↵ | Justin Clark-Casey (justincc) | 2011-06-24 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | rather than just saying "destination not found" Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module This allows us to explicitly tell the hypergridder why the teleport failed (region out of range). It also allows people on regions that are within range (on a large source grid) to teleport. The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit. It could also be decreased. The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -9/+18 |
|\ \ | |/ | |||||
| * | Adjust freeswitch logging to be somewhat less noisy. However, there is ↵ | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -9/+18 |
| | | | | | | | | still quite a large amount of logging present for debug purposes. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -22/+77 |
|\ \ | |/ | |||||
| * | Get Viewer 2 voice working with OpenSim. | Justin Clark-Casey (justincc) | 2011-04-20 | 1 | -13/+66 |
| | | | | | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is. | ||||
| * | Clean up freeswitch config to what is currently required. Add explanation ↵ | Justin Clark-Casey (justincc) | 2011-04-19 | 1 | -13/+15 |
| | | | | | | | | to config parameters. Clean up some log messages. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 2 | -14/+0 |
|\ \ | |/ | |||||
| * | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 2 | -14/+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 use | Melanie | 2011-03-25 | 1 | -11/+11 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 1 | -7/+7 |
|\ \ | |/ | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-03-05 | 1 | -6/+6 |
| | | |||||
| * | Fix the build break | Melanie | 2010-11-29 | 1 | -3/+3 |
| | | |||||
| * | Remove the most spammy XML dumps from the FS voice module | Melanie | 2010-11-28 | 1 | -6/+6 |
| | | |||||
| * | Fox case on a method | Melanie | 2010-11-22 | 1 | -3/+3 |
| | | |||||
* | | Remove some spam from FreeSwitchModule | Melanie | 2010-12-16 | 1 | -2/+2 |
| | | |||||
* | | Fix the build break | Melanie | 2010-11-29 | 1 | -3/+3 |
| | | |||||
* | | Remove the most spammy XML dumps from the FS voice module | Melanie | 2010-11-28 | 1 | -6/+6 |
| | | |||||
* | | Fox case on a method | Melanie | 2010-11-22 | 1 | -3/+3 |
|/ | |||||
* | Change FS Voice module to a shared module to avoid gratuitious server handler | Melanie | 2010-11-22 | 1 | -6/+30 |
| | | | | | registrations. Add the missing bits to drive the local connector's HTTP requests. This makes standalones work. | ||||
* | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵ | Melanie | 2010-11-22 | 1 | -0/+1 |
| | | | | why standalone should not. | ||||
* | Finish the standalone mode freeswitch work and add config examples | Melanie | 2010-11-21 | 1 | -43/+47 |
| | |||||
* | Convert the Freeswitch module to new style | Melanie | 2010-11-21 | 1 | -93/+98 |
| | |||||
* | Strip the dialplan and directory methods from the region module | Melanie | 2010-11-21 | 3 | -522/+10 |
| | |||||
* | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 1 | -69/+54 |
|\ | | | | | | | This brings presence-refactor up to master again | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-02-20 | 1 | -69/+54 |
| | | |||||
| * | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 1 | -52/+20 |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | ||||
| * | Updates all IRegionModules to the new style region modules. | Revolution | 2010-01-23 | 1 | -20/+52 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 2 | -2/+2 |
|/ | |||||
* | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 1 | -2/+2 |
|\ | |||||
| * | * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵ | John Hurliman | 2009-10-02 | 1 | -2/+2 |
| | | | | | | | | | | | | Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework) * Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization? | ||||
* | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -1/+1 |
| | | |||||
* | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 3 | -13/+13 |
| | | |||||
* | | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 1 | -6/+6 |
| | | |||||
* | | addition of a new script function osSetParcelSIPAddress(string SIPAddress), ↵ | Rob Smart | 2009-09-18 | 1 | -3/+52 |
|/ | | | | | | | | now including iVoiceModule This patch allows the land owner to dynamically set the SIP address of a particular land parcel from script. This allows predetermined SIP addresses to be used, making it easier to allow non OpenSim users to join a regions voice channel. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> | ||||
* | warnings safari. | dr scofield (aka dirk husemann) | 2009-09-02 | 1 | -2/+2 |
| | |||||
* | Replace the Replaceable modules name | Melanie | 2009-08-10 | 1 | -1/+1 |
| | |||||
* | Formatting cleanup. | Jeff Ames | 2009-08-09 | 2 | -3/+3 |
| | |||||
* | Patch from otakup0pe: | Melanie | 2009-08-08 | 3 | -34/+51 |
| | | | | | A better solution for making the FreeSwitch module cooperate with existing installations | ||||
* | Revert the #3899 patch and it's two follow ups | Melanie | 2009-08-04 | 3 | -49/+32 |
| | |||||
* | If the FreeSwitch context is unset or "public", then accept any context. | Melanie | 2009-08-04 | 1 | -1/+1 |
| | | | | This restores the "out of the box" functionality. | ||||
* | Output the Freeswitch context received and the context set up in the | Melanie | 2009-08-04 | 1 | -1/+1 |
| | | | | debugging message so a mismatch can be corrected more easily | ||||
* | * Updates libOMV to version 0.7.0 | Teravus Ovares | 2009-07-25 | 2 | -4/+4 |
| | | | | | | | | * 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 Ames | 2009-07-23 | 4 | -140/+138 |
| |