aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-2919-1376/+2154
|\
| * testing for xml-rpc errors in git repo.nebadon2012-09-281-1/+1
| * BulletSim: update SOs and DLLsRobert Adams2012-09-284-0/+0
| * BulletSim: remember to release the physical body and shape when a prim is des...Robert Adams2012-09-282-16/+16
| * BulletSim: add separate runtime and taint-time linkset children lists to keep...Robert Adams2012-09-273-80/+93
| * BulletSim: rename some constraint variables to be consistant with other name ...Robert Adams2012-09-277-116/+231
| * BulletSim: remove the trailing spaces from lines to make git happierRobert Adams2012-09-2710-276/+275
| * BulletSim: remove the unused body management code from BSPrim. There is no go...Robert Adams2012-09-271-374/+0
| * BulletSim: Fix linkset crash. Caused by the different body and shapeRobert Adams2012-09-279-94/+182
| * BulletSim: Terrain sets proper collision flags on creation.Robert Adams2012-09-274-52/+56
| * BulletSim: btGhostObjects working to make 'volume detect' work.Robert Adams2012-09-278-194/+268
| * BulletSim: renamed members of BulletShape, BulletSim and BulletBodyRobert Adams2012-09-2711-270/+482
| * BulletSim: fix regression that caused cylindar shapes to have a box collision...Robert Adams2012-09-271-1/+9
| * BulletSim: complete code for managed code shape and body tracking. Not debugged.Robert Adams2012-09-275-130/+675
| * BulletSim: add class and infrastructure for shape and objectRobert Adams2012-09-275-39/+192
| * BulletSim: Convert BSCharacter to use common BSPhysObject code and variables.Robert Adams2012-09-275-117/+113
| * BulletSim: move a bunch of common logic out of BSPrim and BSCharacterRobert Adams2012-09-277-416/+361
* | Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
|/
* Comment out unused RestPlugins text in OpenSimDefaults.iniJustin Clark-Casey (justincc)2012-09-281-24/+25
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-286-47/+1
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-279-118/+314
| |\
| | * another osgitbot test from github.. mistakes were made!nebadon2012-09-271-1/+1
| | * another test to see if gitbot is alive yetnebadon2012-09-271-1/+1
| | * just testing to see if pcampbot is alive yetnebadon2012-09-261-0/+1
| * | Removed the bits about the TOSModule. That module doesn't go into core. WARNI...Diva Canto2012-09-275-47/+0
* | | Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concur...Justin Clark-Casey (justincc)2012-09-281-6/+11
| |/ |/|
* | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-277-19/+20
* | Don't store undo states if a scene object is manipulated when it is not in a ...Justin Clark-Casey (justincc)2012-09-262-3/+26
* | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.Justin Clark-Casey (justincc)2012-09-261-45/+43
* | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-262-34/+40
* | Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-263-27/+65
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-267-12/+41
|\ \ | |/
| * Use GridUser properly for foreign users.Diva Canto2012-09-265-8/+35
| * Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| * Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
* | Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-254-234/+248
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-251-35/+65
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-09-254-191/+364
| | |\
| | * | Format OpenSim.ini.exampleBlueWall2012-09-251-35/+65
| * | | Fix very recently introduced race condition where a CreateNewItem outracing a...Justin Clark-Casey (justincc)2012-09-251-19/+18
| | |/ | |/|
| * | Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-251-6/+6
| * | Insert transaction ID into AssetXferUploader constructor rather than at Uploa...Justin Clark-Casey (justincc)2012-09-252-36/+49
| * | Move UDP update task item code to AssetXferUploader to match existing create ...Justin Clark-Casey (justincc)2012-09-253-64/+52
| * | Fix occasional race condition failure when creating new clothing/body parts i...Justin Clark-Casey (justincc)2012-09-253-110/+94
* | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-257-5/+104
* | | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-251-2/+190
|\ \ \ | |/ /
| * | Documenting object-related eventsSignpostMarv2012-09-241-0/+43
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-249-27/+269
| |\ \ | | |/