aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\
| * ScenePresence passes the avatar rotation down to the physics engine. This wil...Robert Adams2012-12-281-0/+4
* | Merge branch 'master' into careminsterMelanie2012-12-281-3/+8
|\ \ | |/
| * Add check to always push terse updates for presences that have new velocities...Robert Adams2012-12-271-3/+8
* | Merge branch 'master' into careminsterMelanie2012-12-212-6/+15
|\ \ | |/
| * Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Als...Robert Adams2012-12-182-6/+15
* | Merge branch 'avination' into careminsterMelanie2012-12-182-184/+123
|\ \
| * | Fix locking for goodMelanie2012-12-181-3/+3
| * | Merge branch 'ubitwork' into avinationMelanie2012-12-171-174/+48
| |\ \
| | * | * TEST * unscripted sitUbitUmarov2012-12-171-174/+48
| * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina...Melanie2012-12-171-3/+3
| |\ \ \
| | * | | * Fix for Prim Locking. Prior to the merge, it was just a clone of the root...teravus2012-12-151-4/+4
| | |/ /
| * | | Fix locking objectsMelanie2012-12-161-1/+3
| |/ /
| * | right fix this time ??UbitUmarov2012-12-131-1/+1
| * | fix the 'fix'UbitUmarov2012-12-131-2/+2
| * | fix coment out code not in useUbitUmarov2012-12-131-2/+2
| * | FIX small avatars movement on terrain. (avatar appearance getting evenUbitUmarov2012-12-131-4/+36
| * | add some default size setting and checksUbitUmarov2012-12-071-1/+2
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-2/+2
| * | create a new ode character also with the new informationUbitUmarov2012-12-071-0/+6
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-0/+6
| * | avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-051-4/+11
| * | *TEST* diferent avatar colliderUbitUmarov2012-12-031-2/+13
* | | Merge branch 'master' into careminsterMelanie2012-12-181-5/+13
|\ \ \ | | |/ | |/|
| * | BulletSim: experimentally remove unit displacement from prim border crossing ...Robert Adams2012-12-161-2/+13
* | | Merge branch 'master' into careminsterMelanie2012-12-165-41/+66
|\ \ \ | |/ /
| * | minor: If the physics module tells us that an object has gone out of bounds, ...Justin Clark-Casey (justincc)2012-12-151-2/+5
| * | minor: Add commented out log lines to ScenePresenceAnimator for future debug ...Justin Clark-Casey (justincc)2012-12-141-1/+10
| * | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ...Justin Clark-Casey (justincc)2012-12-142-2/+42
| * | Simplify sit code a bit by determining correct animation in HandleSit instead...Dan Lake2012-12-131-30/+6
| * | Switched the order by which foreign inventory and foreign assets are brought ...Diva Canto2012-12-091-6/+4
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-12-072-5/+14
|\ \ \ | |/ /
| * | Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the ai...Justin Clark-Casey (justincc)2012-12-071-1/+3
| * | minor: Put Scene.PhysicsRequestAsset() into standard C# xml format.Justin Clark-Casey (justincc)2012-12-041-4/+11
* | | Merge branch 'master' into careminsterMelanie2012-11-2519-120/+107
|\ \ \ | |/ / | | / | |/ |/|
| * Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ...Justin Clark-Casey (justincc)2012-11-243-106/+83
| * Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInv...Justin Clark-Casey (justincc)2012-11-241-7/+12
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which automati...Justin Clark-Casey (justincc)2012-11-2417-17/+17
| * minor: Make note in log if scene was restarted due to an unrecoverable physic...Justin Clark-Casey (justincc)2012-11-231-1/+6
* | Merge branch 'master' into careminsterMelanie2012-11-233-19/+81
|\ \ | |/
| * Fix problem where restarting the currently selected region would stop various...Justin Clark-Casey (justincc)2012-11-232-31/+25
| * Add regression test for checking scene close when SceneManager is asked to closeJustin Clark-Casey (justincc)2012-11-231-0/+58
* | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
* | Merge branch 'master' into careminsterMelanie2012-11-231-0/+7
|\ \ | |/
| * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-0/+7
* | Merge branch 'master' into careminsterMelanie2012-11-201-3/+20
|\ \ | |/
| * Minor formatting for 0962a35d and a few one-line comments as to why that code...Justin Clark-Casey (justincc)2012-11-201-8/+7
| * Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
* | Merge branch 'avination' into careminsterMelanie2012-11-173-5/+28
|\ \