aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-1127-139/+206
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-1124-134/+191
| |\
| | * BulletSim: fix CPU loop that occurs when any 'degenerate' sculptieRobert Adams2013-05-101-2/+6
| | * Implement delete key for local consoleJustin Clark-Casey (justincc)2013-05-091-0/+15
| | * minor: Remove unnecessary code that was generating warning in TestXInventoryD...Justin Clark-Casey (justincc)2013-05-091-2/+2
| | * minor: Remove mono compiler warning in RemoteAdminPluginJustin Clark-Casey (justincc)2013-05-091-1/+1
| | * 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-098-14/+11
| | * Fix issue where objects removed via llDie() would not disappear for users loo...Justin Clark-Casey (justincc)2013-05-098-88/+102
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-094-2/+37
| | |\
| | | * Application support:BlueWall2013-05-094-2/+37
| | * | 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-115-3/+60
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-0810-11/+208
|\ \ | |/
| * 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-088-15/+174
* | Merge branch 'master' into careminsterMelanie2013-05-0816-60/+1223
|\ \ | |/
| * Delete "" entry for AvatarPicker cap.Diva Canto2013-05-071-1/+0
| * 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-078-36/+400
| |/
| * 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-0612-268/+186
|\ \ | |/
| * 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
| * Added new method to Remote Admin for reloading the estate settings. This is m...Diva Canto2013-05-061-0/+17
* | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-0682-5745/+7953
| |\
| * | Minor reordering of operations on NewUserConnection. The agent circuit needs ...Diva Canto2013-05-061-5/+17
* | | Merge branch 'master' into careminsterMelanie2013-05-0441-1670/+1431
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into bulletsim4Robert Adams2013-05-037-29/+69
| |\ \
| | * | 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-033-2/+8
| | |\ \
| | * | | On startup, start scenes after we're set up all local scenes, rather than sta...Justin Clark-Casey (justincc)2013-05-036-14/+41
| * | | | 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-0227-6362/+6369
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Make default config directory "."BlueWall2013-05-012-2/+2
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-05-0124-6358/+6358
| | |\ \ \ | | | |/ /
| | * | | Fix inventory issueBlueWall2013-05-011-0/+6
generated by cgit v1.1 at 2024-08-22 14:49:28 +0000