aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-042-2/+2
|\
| * Make default config directory "."BlueWall2013-05-012-2/+2
* | Merge branch 'master' into careminsterMelanie2013-05-012-25/+30
|\ \ | |/
| * Add information about creating a PID file for robust to the Robust.ini and Ro...Justin Clark-Casey (justincc)2013-05-012-25/+30
* | Merge branch 'master' into careminsterMelanie2013-04-255-0/+0
|\ \ | |/
| * BulletSim: version of libBulletSim.so for 32 bit systems that doesn'tRobert Adams2013-04-241-0/+0
| * BulletSim: update DLLs and SOs to they have no dependencies on newerRobert Adams2013-04-244-0/+0
| * revert CSJ2K.dll to version in use prior to commit d4fa2c69ed2895dcab76e0df1b...dahlia2013-04-231-0/+0
* | Merge branch 'master' into careminsterMelanie2013-04-222-9/+10
|\ \ | |/
| * Clean up unused config and config comments.Diva Canto2013-04-212-9/+10
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2219-18164/+17817
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-2112-18164/+17810
| |\ \ | | |/
| | * Fix spellingBlueWall2013-04-201-2/+2
| | * update libomv to git master which adds support for MaterialID in TextureEntrydahlia2013-04-1711-15459/+16598
| * | Merge branch 'master' into careminsterMelanie2013-04-107-0/+7
| |\ \ | | |/
| | * BulletSim: add Bullet HACD library invocation. Turned off by default as notRobert Adams2013-04-094-0/+0
| | * Add more notes to async_call_method relating to UnsafeQueueUserWorkItemJustin Clark-Casey (justincc)2013-04-091-0/+5
| | * BulletSim: Add dylib for BulletSim and add he who figured out building BulletSimRobert Adams2013-04-081-0/+0
| | * fixed bullet config for osxJon Cundill2013-04-081-0/+2
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-224-0/+0
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-04-024-0/+0
| |\ \ | | |/
| | * BulletSim: update unmanaged API for HACD parameter passing. Bullet HACDRobert Adams2013-04-014-0/+0
* | | Add the set object owner floater templateMelanie2013-04-221-0/+8
|/ /
* | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-193-0/+121
|\ \ | |/
| * *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a c...teravus2013-03-163-0/+121
* | Merge branch 'master' into careminsterMelanie2013-03-142-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensim/var/git/opensimteravus2013-03-142-0/+12
| |\
| * | * Updates HttpServer again to re-add the code that closes the stream and conn...teravus2013-03-142-0/+0
* | | Merge branch 'master' into careminsterMelanie2013-03-132-0/+12
|\ \ \ | | |/ | |/|
| * | Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section...Justin Clark-Casey (justincc)2013-03-122-0/+12
| |/
* | Merge branch 'master' into careminsterMelanie2013-03-111-2/+1
|\ \ | |/
| * Update comment about setting physics=BulletSimN as the C# BulletRobert Adams2013-03-101-2/+1
* | Merge branch 'master' into careminsterMelanie2013-03-081-8/+8
|\ \ | |/
| * One more comment inconsistency fixed.Diva Canto2013-03-071-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-073-0/+0
| |\
| * | Fixed inconsistency in comments. Thanks Ai Austin.Diva Canto2013-03-071-8/+8
* | | Merge branch 'master' into careminsterMelanie2013-03-056-0/+29
|\ \ \ | | |/ | |/|
| * | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9teravus2013-03-043-0/+0
| |/
| * GridUserService was missing from [Gatekeeper]Diva Canto2013-03-041-0/+1
| * Added existance and default value for [XEngine]MinTimerInterval to OpenSimDef...Robert Adams2013-03-021-0/+4
| * Move AllowedClients and BannedClients section to new [AccessControl] section ...Justin Clark-Casey (justincc)2013-03-021-2/+6
| * Revert "Removed more vars from [Startup]. I think these were already moved el...Justin Clark-Casey (justincc)2013-03-021-0/+20
* | Merge branch 'master' into careminsterMelanie2013-03-012-112/+93
|\ \ | |/
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-012-92/+93
| * Removed more vars from [Startup]. I think these were already moved elsewhere,...Diva Canto2013-03-011-20/+0
* | Merge branch 'master' into careminsterMelanie2013-02-285-33/+60
|\ \ | |/
| * Robust.HG.ini.example updated to get an [Hypergrid] section too.Diva Canto2013-02-281-14/+15
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-273-6/+15
| |\
| | * Do not have the Freeswitch connector on by default in Robust ini example files.Justin Clark-Casey (justincc)2013-02-272-2/+4
| * | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-273-17/+41