aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Prevent a nullref when nonphysical motion objects cross sim boundariesMelanie2012-02-231-1/+1
* Partially apply the core banlines fixMelanie2012-02-232-6/+9
* Fix preserving the animation state of a crossing seated avatarMelanie2012-02-231-2/+10
* Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-231-0/+3
* Merge branch 'master' into careminsterMelanie2012-02-232-10/+7
|\
| * 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-232-2/+5
| |/
* | Adjust sit target and the llSetLinkPrimitiveParams sit position hackMelanie2012-02-221-2/+22
* | 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-16/+2
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-11/+1
| * Revert "Fix:Cannot drag inventory from child prim into inventory http://opens...Justin Clark-Casey (justincc)2012-02-211-8/+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-211-15/+14
|\ \ | |/
| * Fix bug where NPCs would establish child agents on other neighbour regions th...Justin Clark-Casey (justincc)2012-02-211-15/+14
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-202-6/+3
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-202-6/+3
| |\ \ | | |/
| | * More improvements on agent position updates: if the target sims fail, blackli...Diva Canto2012-02-201-5/+2
| | * 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-193-13/+21
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-193-13/+21
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-192-9/+9
| | |\
| | | * 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-192-7/+15
* | | | 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
* | | | | Merge branch 'ubitwork'Melanie2012-02-195-26/+636
|\ \ \ \ \ | |/ / / /
| * | | | moved vehicle from SOG to SOPUbitUmarov2012-02-193-104/+79
| * | | | missing paramenters init plus some cleaningUbitUmarov2012-02-181-91/+16
| * | | | added a EnUsCulture whatever that is..UbitUmarov2012-02-181-4/+3
| * | | | a bit less human readable xmlUbitUmarov2012-02-181-25/+25
| * | | | added some ToXml2 to SOGVehicle ( unused untested )UbitUmarov2012-02-181-1/+84
| * | | | changed how vehicle data is stored and passed to physics. use unsafe in seria...UbitUmarov2012-02-182-163/+175
| * | | | vehicle parameters do cross (i hope) on regions in same instance ( others ne...UbitUmarov2012-02-182-13/+57
| * | | | let SOG know about vehicles. Still needs serialization and applyphyscis on d...UbitUmarov2012-02-183-30/+541
| * | | | don't freeze with a sitted avatar in a border without other sim. Still messy :(UbitUmarov2012-02-151-1/+8
| * | | | try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-152-6/+9
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-155-68/+194
| |\ \ \ \
| * | | | | scenepresence change! in standup() give avatar a physical actor after decidin...UbitUmarov2012-02-111-0/+10
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-105-7/+65
| |\ \ \ \ \
| * | | | | | initial introdution of physics actor building control.UbitUmarov2012-02-083-9/+58
| * | | | | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ...UbitUmarov2012-02-081-2/+4