aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Resolve one more conflict I overlookedMelanie2010-01-291-14/+0
* Revert "Updates all IRegionModules to the new style region modules."Melanie2010-01-2976-1811/+879
* Merge branch 'master' into careminsterMelanie2010-01-282-4/+8
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-280-0/+0
| |\
| | * * one more test of mantisbotTeravus Ovares (Dan Olivares)2010-01-281-1/+1
| | * Test osmantis (quiet)Teravus Ovares (Dan Olivares)2010-01-281-1/+1
| * | Fixes inconsistencies in the permissions module. Adds a region_manager_is_godMelanie2010-01-282-4/+8
| |/
* | Fixes terrain editing. Changes ThrottleOutPacketType to task instead of land.Revolution2010-01-281-1/+1
* | Merge branch 'master' into careminsterMelanie2010-01-2810-68/+72
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-289-67/+67
| |\
| | * * .. More Endlines...Teravus Ovares (Dan Olivares)2010-01-261-1/+1
| | * more endlines..Teravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * a few more endlines..Teravus Ovares (Dan Olivares)2010-01-261-4/+4
| | * * A few other endlines...Teravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in Mock/TestClient.csTeravus Ovares (Dan Olivares)2010-01-261-8/+8
| | * * Fix Endlines in SirikataClientView.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in IRCClientView.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in VWHClientView.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in MyNpcCharacter.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| * | Changes WorldCommModule to ISharedRegionModule.Revolution2010-01-281-1/+5
| |/
* | Some merge fixupsMelanie2010-01-264-22/+11
* | Merge branch 'master' into careminsterMelanie2010-01-2690-900/+2078
|\ \ | |/
| * Replace dome tabs with spacesMelanie2010-01-261-3/+3
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-269-19/+79
| |\
| | * Fix a problem where llDie() calls were sometimes leaving dead objects behind.Justin Clark-Casey (justincc)2010-01-258-19/+73
| | * * Quick fix to Remote Console session ID handling.Adam Frisby2010-01-261-0/+6
| * | Fixes Region Crossings on a prim.Revolution2010-01-241-1/+9
| |/
| * Added some prebuild refs needed for mono buildingMelanie2010-01-231-0/+3
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-235-5/+154
| |\
| | * Add first part of test for checking restore of task inventory items on oar loadJustin Clark-Casey (justincc)2010-01-223-1/+50
| | * complete assertion checks of all other oar loaded region settingsJustin Clark-Casey (justincc)2010-01-221-0/+28
| | * minor: remove warning from LLClientViewJustin Clark-Casey (justincc)2010-01-221-2/+2
| | * Allow oar loading to work even if an estate module is not presentJustin Clark-Casey (justincc)2010-01-222-2/+74
| * | Updates all IRegionModules to the new style region modules.Revolution2010-01-2376-892/+1837
| |/
| * add a target position to agent updates to ScenePresence to support alternativ...unknown2010-01-211-1/+7
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2010-01-2116-98/+284
|\ \
| * | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associat...Kitto Flora2010-01-2115-4/+174
| * | ChODE Object Linear Motion updateKitto Flora2010-01-212-87/+102
| * | Merge branch 'master' into casperCasperW2010-01-204-5/+21
| |\ \
| * | | Fixed an issue with PayPrice sometimes being shared between multiple objectsCasperW2010-01-202-7/+8
* | | | Merge branch 'master' into careminsterMelanie2010-01-216-71/+77
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fixes llSetDamage. Patch from RevolutionRevolution2010-01-211-7/+5
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-201-0/+3
| |\ \
| | * | Add OpenSim.Server.ini.example documentation for the new AllowDuplicateNames ...Justin Clark-Casey (justincc)2010-01-191-0/+3
| * | | Console output no longer requires loglevel to be set to info; you can run the...mbowman2010-01-204-64/+69
| |/ /
| * | Comment the asset deletion handler. It can be abused and is not currentlyMelanie2010-01-181-1/+1
* | | Adds example to OpenSim.ini.example for Admin Default Parcel settingsCareminster Staff2010-01-192-2/+11
* | | Comment the asset deletion handler. It can be abused and is not currentlyMelanie2010-01-181-1/+1
* | | Merge branch 'master' into careminsterMelanie2010-01-181-2/+9
|\ \ \ | |/ / | | / | |/ |/|
| * Fix a major security problem with osSetDynamicTexture which allowed the delet...CasperW2010-01-181-5/+12