aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-231-5/+31
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Show avatars as sitting on proot prims only to avoid motion jitterMelanie2012-02-231-5/+31
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-2311-31/+94
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2012-02-238-29/+28
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
| | |\
| | | * Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in con...Justin Clark-Casey (justincc)2012-02-221-8/+2
| | * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-238-18/+25
| | |/
| * | Add permission checks to scripted object movements, which didn't respect bansMelanie2012-02-233-1/+59
| * | Count agents for LSL instead of relying on SceneGraph to have the correctMelanie2012-02-221-1/+7
* | | fix the last fix. Regions are square but... Also remove the 0.5 offset in ma...UbitUmarov2012-02-231-1/+3
* | | fix my bug on ChODE terrain heightmap buildUbitUmarov2012-02-231-3/+3
|/ /
* | Adjust sit target and the llSetLinkPrimitiveParams sit position hackMelanie2012-02-222-16/+68
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+9
|\ \ | |/
| * Restore the taskItem null check that I accidentally blatted in 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
* | Merge branch 'master' into careminsterMelanie2012-02-211-1/+1
|\ \ | |/
| * Fix:LINK_ROOT flag for llGetLinkName() by SinglePrimPixelTomsen2012-02-211-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-212-35/+5
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-212-30/+4
| * Revert "Fix:Cannot drag inventory from child prim into inventory http://opens...Justin Clark-Casey (justincc)2012-02-211-8/+4
* | Reverse the changed to ODE heightmap. It results in SERIOUS issues like anMelanie2012-02-211-4/+4
* | Merge branch 'master' into careminsterMelanie2012-02-211-4/+8
|\ \ | |/
| * Fix:Cannot drag inventory from child prim into inventory http://opensimulator...PixelTomsen2012-02-211-4/+8
* | Also preserve angular velocity on crossing.Melanie2012-02-211-0/+3
* | Merge branch 'master' into careminsterMelanie2012-02-2122-979/+68
|\ \ | |/
| * 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-213-0/+3
| * 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-2111-14/+51
| * Fix bug where NPCs would establish child agents on other neighbour regions th...Justin Clark-Casey (justincc)2012-02-211-15/+14
| * Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-218-1026/+0
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-204-13/+23
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-204-13/+23
| |\ \ | | |/
| | * Amend to last commit: synchronize access to queues.Diva Canto2012-02-201-2/+5
| | * More improvements on agent position updates: if the target sims fail, blackli...Diva Canto2012-02-202-11/+16
| | * One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3
| | * Amend to last commit. This should have been committed too.Diva Canto2012-02-191-1/+1
* | | Make vehicles retain velocity when crossing between regions.Melanie2012-02-201-0/+4
* | | Add an override to make SOG.Velocity work as expectedMelanie2012-02-201-0/+6
|/ /
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-194-18/+29
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-194-18/+29
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-193-10/+11
| | |\
| | | * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
| | * | A few more tweaks on position updates and create child agents. Mono hates con...Diva Canto2012-02-193-11/+23
* | | | Uncomment serializationMelanie2012-02-191-3/+3
* | | | Merge branch 'ubitwork'Melanie2012-02-193-4/+300
|\ \ \ \
| * | | | simplified vehicle fromXml. Use still comented on SceneObjectSerialized.csUbitUmarov2012-02-191-77/+117
| * | | | Vehicle XML serialization more complete. Inactived by coments in SceneObjectS...UbitUmarov2012-02-193-4/+260
* | | | | Fix merge issues in prebuildMelanie2012-02-191-1/+5
* | | | | Merge branch 'ubitwork'Melanie2012-02-1929-1105/+13371
|\ \ \ \ \ | |/ / / /