aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-293-37/+136
|\
| * Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-283-57/+143
| |\
| | * make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| * | Fix a possible NREMelanie2012-09-281-3/+10
* | | Merge branch 'master' into careminsterMelanie2012-09-2916-1403/+2222
|\ \ \
| * | | 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-2913-1372/+2150
| |\ \ \
| | * | | 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-277-191/+265
| | * | | 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
| |/ / /
| * | | 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-275-19/+12
| * | | 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-264-7/+11
| |\ \ \
| * | | | Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
* | | | | Merge branch 'avination' into careminsterMelanie2012-09-2721-375/+1465
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Streamline and improve llGetMassMelanie2012-09-261-23/+17
| | |_|/ | |/| |
| * | | just remove the damm thingUbitUmarov2012-09-264-4/+4
| * | | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-263-12/+2
| * | | UriModule GetEvents also doesn't need a request bodyUbitUmarov2012-09-261-0/+1
| * | | more changes to PollServiceUbitUmarov2012-09-262-1/+7
| * | | missed changeUbitUmarov2012-09-251-1/+2
| * | | do the same to webFecthInvDescModuleUbitUmarov2012-09-251-33/+25
| * | | change GetTextureModule processingUbitUmarov2012-09-251-29/+31
| * | | Text changes for upload messagesMelanie2012-09-241-4/+4
| * | | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-242-68/+128
| * | | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-245-7/+33
| * | | Merge branch 'ubitwork' into avinationMelanie2012-09-244-37/+38
| |\ \ \
| | * | | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-244-37/+38
| * | | | Protect the responses map with a lock. Also remove ugly "this." type ofMelanie2012-09-232-18/+24
| * | | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing.Melanie2012-09-231-4/+4
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-09-233-203/+373
| |\ \ \ \ | | |/ / /
| | * | | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-232-41/+210
| | * | | report asset upload errors the right awayUbitUmarov2012-09-222-29/+75
| | * | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-221-42/+24