aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-265-2/+3
|\
| * Update BulletSim.dll with some interface changes and tuning (see opensim-libs...Robert Adams2012-01-255-2/+3
* | Merge branch 'master' into careminsterMelanie2012-01-211-0/+6
|\ \ | |/
| * Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collid...Justin Clark-Casey (justincc)2012-01-207-0/+0
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-171-0/+6
| |\
| | * Update osGetGrid**** functionsBlueWall2012-01-171-0/+6
| * | Change linux, windows and mac ODE libraries to use the GIMPACT collider rathe...Justin Clark-Casey (justincc)2012-01-177-0/+0
| |/
| * Comment out noisy log lines I accidentally included in the nant build target ...Justin Clark-Casey (justincc)2012-01-161-1/+1
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-124-9/+9
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-123-6/+6
| * Correcting ini.example were permissionmodules uses komma instead of space as ...Michelle Argus2012-01-121-3/+3
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+0
|\ \ | |/
| * Remove DEBUG optionBlueWall2012-01-101-5/+0
* | Merge branch 'master' into careminsterMelanie2012-01-101-0/+6
|\ \ | |/
| * Add some run-time debugging supportBlueWall2012-01-091-0/+6
* | Merge branch 'master' into careminsterMelanie2012-01-061-11/+12
|\ \ | |/
| * eliminate a few tabs from OpenSimDefaults.iniJustin Clark-Casey (justincc)2012-01-061-10/+10
| * Add disabled Cap_FetchInventory2 = "" reference to [ClientStack.LindenCaps] i...Justin Clark-Casey (justincc)2012-01-061-3/+4
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+0
|\ \ | |/
| * Update C5.dll to version 1.1.1 from 1.1.0Justin Clark-Casey (justincc)2012-01-031-0/+0
* | Merge branch 'master' into careminsterMelanie2012-01-024-3/+5
|\ \ | |/
| * Bring back the Hyperlinker to the Robust console. Moved the config to [GridSe...Diva Canto2011-12-304-3/+5
* | Merge branch 'master' into careminsterMelanie2011-12-281-0/+0
|\ \ | |/
| * Add Copy task to Prebuild.exe (vsxxxx targets)BlueWall2011-12-251-0/+0
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+5
|\ \ | |/
| * Make it possible to force all prims to be phantom via the collidable_prim boo...Justin Clark-Casey (justincc)2011-12-221-0/+5
* | Merge branch 'master' into careminsterMelanie2011-12-181-1/+4
|\ \ | |/
| * Add more documentation to EstateConnectorString in StandaloneCommon.ini.exampleJustin Clark-Casey (justincc)2011-12-171-1/+4
* | Merge branch 'master' into careminsterMelanie2011-12-143-6/+0
|\ \ | |/
| * Get rid of the 'lolcat' library asset.Justin Clark-Casey (justincc)2011-12-122-6/+0
| * Remove long unused libdb_dotNET43.dllJustin Clark-Casey (justincc)2011-12-121-0/+0
* | Set adaptive throttles false by default because it doesn't play nice with AVNMelanie2011-12-091-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-091-0/+33
|\ \ | |/
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-081-0/+33
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-085-0/+0
|\ \ | |/
| * Update libomv to 0.9.1BlueWall2011-12-074-0/+0
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-021-1/+1
| |\
| * | Make fix to Nini for null references in some cases.BlueWall2011-11-291-0/+0
* | | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ \ | | |/ | |/|
| * | change misleading login = http://127.0.0.1:9000/ in GridInfoService in Robust...Justin Clark-Casey (justincc)2011-12-031-1/+1
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-281-7/+10
|\ \ | |/
| * Implement the FetchInventoryDescendents2 capability using the same code as We...Justin Clark-Casey (justincc)2011-11-251-4/+7
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-251-3/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-242-7/+7
|\ \ | |/
| * Shell Environment Variables in configBlueWall2011-11-231-0/+0
| * Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in OpenSim.ini...Justin Clark-Casey (justincc)2011-11-211-7/+7
* | Merge branch 'master' into bigmergeMelanie2011-11-197-5491/+5492
|\ \ | |/
| * Enable v2/v3 map tile url setting on robust as default in configJustin Clark-Casey (justincc)2011-11-192-2/+2
| * Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.justincc2011-11-183-5456/+5453