aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-251-23/+17
|\
| * Cleaned up various configuration options. Removed the category throttleMic Bowman2011-04-251-23/+17
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-257-0/+1
|\ \ | |/
| * Removed unused libraries: RAILS.dll and dependencies.Diva Canto2011-04-243-0/+0
| * Removed unused libraries Castle.*Diva Canto2011-04-243-0/+0
| * Added MaxAgents configuration option to RegionConfig.ini allowing region host...E. Allen Soard2011-04-231-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-221-1/+1
|\ \ | |/
| * fix merge conflicts with OpenSimDefaults.iniBlueWall2011-04-214-45/+91
| |\
| * | some mesh config astheticsBlueWall2011-04-211-1/+1
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-212-10/+6
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-215-46/+92
| |\ \ | | |/ | |/|
| | * Remove duplicated freeswitch settings.Justin Clark-Casey (justincc)2011-04-211-4/+0
| * | Group collada meshies settings under [Mesh] in OpensimDefaults.iniBlueWall2011-04-211-6/+6
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-215-49/+101
|\ \ \ | | |/ | |/|
| * | synchronize Robust.HG.ini.example FreeSWITCH config with other config filesJustin Clark-Casey (justincc)2011-04-191-10/+32
| * | For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. Thanks...Justin Clark-Casey (justincc)2011-04-191-1/+1
| * | Clean up freeswitch config to what is currently required. Add explanation to...Justin Clark-Casey (justincc)2011-04-193-35/+63
| |/
| * Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future co...Justin Clark-Casey (justincc)2011-04-181-4/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-181-0/+7
|\ \ | |/
| * Provide a configuration setting to control whether multiple taken objects are...Justin Clark-Casey (justincc)2011-04-181-0/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-172-11/+14
|\ \ | |/
| * Add ColladaMesh switchBlueWall2011-04-141-1/+5
| * Move example HttpProxy setting to OpenSim.ini.example and tidyJustin Clark-Casey (justincc)2011-04-122-9/+8
| * minor typo correction. thanks Ai Austin.Justin Clark-Casey (justincc)2011-04-121-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-123-48/+90
|\ \ | |/
| * slightly tweak OpenSim.ini.example textJustin Clark-Casey (justincc)2011-04-111-2/+2
| * Add information comment to top of OpenSimDefaults.ini and make file consistentJustin Clark-Casey (justincc)2011-04-111-13/+22
| * Add more instructions to OpenSim.ini.example to try and make it more understa...Justin Clark-Casey (justincc)2011-04-111-35/+68
| * Update ODE for mac from source code in opensim-libs SVN library. This versio...Justin Clark-Casey (justincc)2011-04-081-0/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-086-30/+1
|\ \ | |/
| * Remove old SQLite libraryJustin Clark-Casey (justincc)2011-04-081-0/+0
| * Remove the SQLite legacy adaptor. This is no longer needed now that the main...Justin Clark-Casey (justincc)2011-04-073-30/+0
| * Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and ...Justin Clark-Casey (justincc)2011-04-072-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-013-2/+13
|\ \ | |/
| * Fix mantis #5413. WARNING: new config variable in section [GridService] of th...Diva Canto2011-03-282-0/+11
| * More touchup for SQLite.Marck2011-03-281-1/+1
| * Touchup for SQLiteBlueWall2011-03-271-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-273-0/+4
|\ \ | |/
| * Fix a typo in the SQLite DLL config and amend the instructions for running on...Marck2011-03-231-1/+1
| * Typo fixBlueWall2011-03-221-1/+1
| * More SQLite work.BlueWall2011-03-223-0/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-213-0/+1
|\ \ | |/
| * Upgrade SQLite:BlueWall2011-03-183-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-102-0/+0
|\ \ | |/
| * Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-091-0/+0
| * Update MySql.Data.dll to version 6.3.6.Justin Clark-Casey (justincc)2011-03-091-0/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-241-0/+7
|\ \ | |/
| * Parameterizes the view distance used to compute and manageMic Bowman2011-02-221-0/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-193-3/+3
|\ \ | |/
| * Changed default directory for storing map tile images from remote regions.Marck2011-02-163-3/+3