aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-1113-59/+125
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-1113-57/+125
| |\
| | * BulletSim: fix CPU loop that occurs when any 'degenerate' sculptieRobert Adams2013-05-101-2/+6
| | * Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| | * Only send one kill object to the deleter when they derez an object rather tha...Justin Clark-Casey (justincc)2013-05-092-17/+12
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-096-9/+9
| | * Fix issue where objects removed via llDie() would not disappear for users loo...Justin Clark-Casey (justincc)2013-05-095-21/+93
| | * minor: Simplify test setup in SceneObjectDeRezTests since permissions module ...Justin Clark-Casey (justincc)2013-05-091-10/+4
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-112-2/+12
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-086-11/+149
|\ \ | |/
| * Guard the scene list when estates are updatedMelanie2013-05-082-9/+14
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-084-15/+114
* | Merge branch 'master' into careminsterMelanie2013-05-0811-58/+1002
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-071-6/+10
| |\
| | * Bulletsim: and the rotational friction.Vegaslon2013-05-071-3/+5
| | * BulletSim: Another way to create vehicle framed friction.Vegaslon2013-05-071-3/+5
| * | Added AvatarPickerSearch capability handler.Diva Canto2013-05-073-35/+179
| |/
| * BulletSim: normalize quaternian rotations when building compound linksets.Robert Adams2013-05-061-7/+7
| * BulletSim: properly free references to simple convex hull shapes. Didn'tRobert Adams2013-05-061-8/+37
| * Step 3: Commit the Avination XEstate estate comms handlerMelanie2013-05-073-0/+767
| * Step 2: commit the IEstateModuleInterface changes neededMelanie2013-05-071-1/+2
| * Step one of estate settings sharing - port the Avination Estate module (compl...Melanie2013-05-075-27/+71
* | Merge branch 'master' into careminsterMelanie2013-05-071-6/+6
|\ \ | |/
| * BulletSim: apply linear and angular friction in vehicle coordinatesRobert Adams2013-05-061-6/+6
* | Merge branch 'master' into careminsterMelanie2013-05-0611-268/+169
|\ \ | |/
| * BulletSim: remove friction calcuation from BSMotor and move linear andRobert Adams2013-05-067-67/+47
| * BulletSim: simplify parameter specification by reducing the number ofRobert Adams2013-05-062-191/+94
| * BulletSim: extend BSActorLockAxis to allow locking linear movement inRobert Adams2013-05-063-10/+28
* | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-0644-1761/+1986
| |\
| * | Minor reordering of operations on NewUserConnection. The agent circuit needs ...Diva Canto2013-05-061-5/+17
* | | Merge branch 'master' into careminsterMelanie2013-05-0436-1659/+1407
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into bulletsim4Robert Adams2013-05-034-20/+47
| |\ \
| | * | Fix possible race condition with local region cache if a region was added aft...Justin Clark-Casey (justincc)2013-05-031-15/+28
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-031-0/+6
| | |\ \
| | * | | On startup, start scenes after we're set up all local scenes, rather than sta...Justin Clark-Casey (justincc)2013-05-033-5/+19
| * | | | BulletSim: zero vehicle motion when changing vehicle type.Robert Adams2013-05-036-26/+18
| * | | | BulletSim: prims with no cuts created with single convex hull shape.Robert Adams2013-05-024-2/+99
| * | | | BulletSim: Rebuild physical body if physical shape changes for mesh and hull.Robert Adams2013-05-024-24/+73
| * | | | Merge branch 'master' into bulletsim4Robert Adams2013-05-021-2/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix inventory issueBlueWall2013-05-011-0/+6
| | |/ /
| * | | BulletSim: fix crash when mesh asset wasn't available when meshingRobert Adams2013-05-012-10/+19
| * | | BulletSim: rework LinksetCompound to work with new BSShape system.Robert Adams2013-05-011-106/+40
| * | | Merge branch 'master' into bulletsim4Robert Adams2013-05-0110-97/+492
| |\ \ \
| * | | | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working...Robert Adams2013-04-305-17/+50
| * | | | BulletSim: Add non-static BSShape.GetReference for getting another referenceRobert Adams2013-04-292-32/+102
| * | | | BulletSim: LinksetCompound work to disable collision for root andRobert Adams2013-04-291-14/+30
| * | | | BulletSim: remove trailing white space to make git happier. No functional cha...Robert Adams2013-04-2920-152/+152
| * | | | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_phys...Robert Adams2013-04-2911-282/+282
| * | | | BulletSim: first cut at new linksetCompound shape building.Robert Adams2013-04-291-63/+27