aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-09-2929-1485/+2258
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Get rid of some unnecessary casts in RemoteAdminPlugin.Justin Clark-Casey (justincc)2012-09-291-5/+5
| | * | | | | | | | | | | | Fix bug where debug http level 6 could not be specified. Also converts newli...Justin Clark-Casey (justincc)2012-09-292-5/+5
| | * | | | | | | | | | | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object...Justin Clark-Casey (justincc)2012-09-292-14/+18
| | * | | | | | | | | | | | 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
| | | * | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-09-2736-475/+1637
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove a core undo call that we don't need.Melanie2012-09-271-2/+0
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-09-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | just testing to see if pcampbot is alive yetnebadon2012-09-261-0/+1
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge commit '2bf42f30af5030890b8e3ff5bb29074a1f0e9085' into careminsterMelanie2012-09-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-272-31/+42
| * | | | | | | | | | | | | | Merge commit '327320d1a7acbba969d26c281f92f64ce8ff365f' into careminsterMelanie2012-09-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
| * | | | | | | | | | | | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-2712-19/+147
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ \ \ \ \