aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-231-0/+5
|\
| * Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini fo...Justin Clark-Casey (justincc)2012-03-231-0/+5
* | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-222-0/+17
|\ \ | |/
| * Added new simple_build_permissions config to the .ini and .example files.Diva Canto2012-03-222-0/+17
* | Merge branch 'master' into careminsterMelanie2012-03-222-4/+8
|\ \ | |/
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-222-15/+0
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-222-0/+15
| * Fix typoBlueWall2012-03-211-2/+2
| * HG Friends config for Robust.HG.ini.exampleDiva Canto2012-03-201-2/+6
* | Merge branch 'master' into careminsterMelanie2012-03-211-1/+5
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-207-10/+7
| |\
| * | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-201-1/+5
* | | Merge branch 'master' into careminsterMelanie2012-03-207-10/+7
|\ \ \ | | |/ | |/|
| * | Move startup/shutdown command .txt files to .txt.example files to avoid clobb...Justin Clark-Casey (justincc)2012-03-194-6/+6
| * | Fix configuration problems where XAssetDatabasePlugin was picked up accidenta...Justin Clark-Casey (justincc)2012-03-193-4/+1
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-1814-116/+41
|\ \ | |/
| * More on HG access control. This commit splits the UserManagementModule into t...Diva Canto2012-03-172-0/+2
| * BAD JUSTIN!Diva Canto2012-03-173-0/+3
| * Region access control! Region operators can now specify things like DisallowF...Diva Canto2012-03-176-6/+24
| * Terrain: added [Terrain] section with an option to load an initial flat terra...Diva Canto2012-03-162-1/+6
| * Move startup_commands.txt.example to startup_commands.txt for consistency wit...Justin Clark-Casey (justincc)2012-03-163-4/+4
| * Remove unnecessary "backup" command in shutdown_commands.txtJustin Clark-Casey (justincc)2012-03-161-1/+2
| * Remove unused bin/ScriptEngines/Default.lslJustin Clark-Casey (justincc)2012-03-161-104/+0
* | Merge branch 'master' into careminsterMelanie2012-03-141-5/+1
|\ \ | |/
| * Change OpenSim.ini.example to reflect how to actually enable prim limits,Melanie2012-03-121-5/+1
* | Merge branch 'master' into careminsterMelanie2012-03-111-3/+19
|\ \ | |/
| * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-3/+19
* | Fix UbitODE dll mappping by simply copying the one from ODE.NetMelanie2012-03-093-6/+6
* | Merge branch 'master' into careminsterMelanie2012-03-042-0/+9
|\ \ | |/
| * Add WebProfiles config to other config exampleBlueWall2012-03-041-0/+3
| * Merge branch 'master' into v3_supportBlueWall2012-03-024-0/+0
| |\
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_supportBlueWall2012-02-2522-14/+14
| |\ \
| * | | V3 SupportBlueWall2012-02-221-0/+3
| * | | Add web profile url setting to iniBlueWall2012-02-211-0/+3
* | | | Merge branch 'master' into careminsterMelanie2012-03-034-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove more now unused third party libraries.Justin Clark-Casey (justincc)2012-03-014-0/+0
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-02-2522-14/+14
|\ \ \ | |/ /
| * | Move libopenjpeg native libraries into lib32 and lib64 as appropriate.Justin Clark-Casey (justincc)2012-02-255-5/+5
| * | Remove some more unused Bullet libraries.Justin Clark-Casey (justincc)2012-02-253-0/+0
| * | Remove old libbulletnet native libraries. These are not used in the current ...Justin Clark-Casey (justincc)2012-02-252-0/+0
| * | Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ...Justin Clark-Casey (justincc)2012-02-259-9/+9
| * | Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like th...Justin Clark-Casey (justincc)2012-02-253-0/+0
| |/
* | Merge branch 'master' into careminsterMelanie2012-02-216-0/+0
|\ \ | |/
| * Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ...Justin Clark-Casey (justincc)2012-02-211-0/+0
| * Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.Justin Clark-Casey (justincc)2012-02-212-0/+0
| * Replace previous windows 64-bit sqlite3.dll with one from http://system.data....Justin Clark-Casey (justincc)2012-02-211-0/+0
| * Replace win 64-bit sqlite3.dll with another version, though I suspect this on...Justin Clark-Casey (justincc)2012-02-211-0/+0
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-212-0/+0
| * Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-212-0/+0
* | Merge branch 'ubitwork'Melanie2012-02-193-0/+7
|\ \