Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-05-11 | 24 | -134/+191 |
|\ | |||||
| * | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie | Robert Adams | 2013-05-10 | 1 | -2/+6 |
| | | | | | | | | | | is in a region. This fixes the high CPU usage for regions with nothing else going on. | ||||
| * | Implement delete key for local console | Justin Clark-Casey (justincc) | 2013-05-09 | 1 | -0/+15 |
| | | |||||
| * | minor: Remove unnecessary code that was generating warning in ↵ | Justin Clark-Casey (justincc) | 2013-05-09 | 1 | -2/+2 |
| | | | | | | | | TestXInventoryDataPlugin | ||||
| * | minor: Remove mono compiler warning in RemoteAdminPlugin | Justin Clark-Casey (justincc) | 2013-05-09 | 1 | -1/+1 |
| | | |||||
| * | Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset(). | Justin Clark-Casey (justincc) | 2013-05-09 | 1 | -1/+4 |
| | | | | | | | | | | This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction. This looks to address http://opensimulator.org/mantis/view.php?id=6600 | ||||
| * | Only send one kill object to the deleter when they derez an object rather ↵ | Justin Clark-Casey (justincc) | 2013-05-09 | 2 | -17/+12 |
| | | | | | | | | | | | | than two. Extend regression test to check this. | ||||
| * | remove pointless region handle paramter from IClientAPI.SendKillObject() | Justin Clark-Casey (justincc) | 2013-05-09 | 8 | -14/+11 |
| | | |||||
| * | Fix issue where objects removed via llDie() would not disappear for users ↵ | Justin Clark-Casey (justincc) | 2013-05-09 | 8 | -88/+102 |
| | | | | | | | | | | | | | | | | looking in from neighbouring sims. This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason. Added regression test for this case. This fixes http://opensimulator.org/mantis/view.php?id=6627 | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-09 | 4 | -2/+37 |
| |\ | |||||
| | * | Application support: | BlueWall | 2013-05-09 | 4 | -2/+37 |
| | | | | | | | | | | | | Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl" | ||||
| * | | minor: Simplify test setup in SceneObjectDeRezTests since permissions module ↵ | Justin Clark-Casey (justincc) | 2013-05-09 | 1 | -10/+4 |
| |/ | | | | | | | doesn't need different configuration anymore | ||||
* | | Send up the part missing from the Avination Estate commit. | Melanie | 2013-05-11 | 5 | -3/+60 |
|/ | | | | Warning - contains a small migration. | ||||
* | Guard the scene list when estates are updated | Melanie | 2013-05-08 | 2 | -9/+14 |
| | |||||
* | Adds an event and a method so that handling of the CachedTexture | Mic Bowman | 2013-05-08 | 8 | -15/+174 |
| | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache). | ||||
* | Delete "" entry for AvatarPicker cap. | Diva Canto | 2013-05-07 | 1 | -1/+0 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-07 | 1 | -6/+10 |
|\ | |||||
| * | Bulletsim: and the rotational friction. | Vegaslon | 2013-05-07 | 1 | -3/+5 |
| | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| * | BulletSim: Another way to create vehicle framed friction. | Vegaslon | 2013-05-07 | 1 | -3/+5 |
| | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
* | | Added AvatarPickerSearch capability handler. | Diva Canto | 2013-05-07 | 8 | -36/+400 |
|/ | |||||
* | BulletSim: normalize quaternian rotations when building compound linksets. | Robert Adams | 2013-05-06 | 1 | -7/+7 |
| | | | | Attempt to fix vehicles being twisted off the ground when they go physical. | ||||
* | BulletSim: properly free references to simple convex hull shapes. Didn't | Robert Adams | 2013-05-06 | 1 | -8/+37 |
| | | | | loose memory since shapes are shared but did mess up usage accounting. | ||||
* | Step 3: Commit the Avination XEstate estate comms handler | Melanie | 2013-05-07 | 3 | -0/+767 |
| | | | | This adds estate-wide Teleport Home and Teleport All User Home as well | ||||
* | Step 2: commit the IEstateModuleInterface changes needed | Melanie | 2013-05-07 | 1 | -1/+2 |
| | |||||
* | Step one of estate settings sharing - port the Avination Estate module ↵ | Melanie | 2013-05-07 | 5 | -27/+71 |
| | | | | (complete module) as changes are too extensive to apply manually | ||||
* | BulletSim: apply linear and angular friction in vehicle coordinates | Robert Adams | 2013-05-06 | 1 | -6/+6 |
| | | | | and not world coordinates. | ||||
* | BulletSim: remove friction calcuation from BSMotor and move linear and | Robert Adams | 2013-05-06 | 7 | -67/+47 |
| | | | | | | | angular friction computation into linear and angular movement code. The friction wasn't being applied properly. This will make it so vehicles don't drift as much and the drift is tunable by changing the friction timescales. | ||||
* | BulletSim: simplify parameter specification by reducing the number of | Robert Adams | 2013-05-06 | 2 | -191/+94 |
| | | | | specifications required for simple properties with defaults. | ||||
* | BulletSim: extend BSActorLockAxis to allow locking linear movement in | Robert Adams | 2013-05-06 | 3 | -10/+28 |
| | | | | addition to angular movement. Not enabled by anything yet. | ||||
* | Added new method to Remote Admin for reloading the estate settings. This is ↵ | Diva Canto | 2013-05-06 | 1 | -0/+17 |
| | | | | meant to be called when some other program has changed the data on the backend. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-06 | 82 | -5745/+7953 |
|\ | |||||
| * | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-03 | 7 | -29/+69 |
| |\ | |||||
| | * | Fix possible race condition with local region cache if a region was added ↵ | Justin Clark-Casey (justincc) | 2013-05-03 | 1 | -15/+28 |
| | | | | | | | | | | | | after startup. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-03 | 3 | -2/+8 |
| | |\ | |||||
| | * | | On startup, start scenes after we're set up all local scenes, rather than ↵ | Justin Clark-Casey (justincc) | 2013-05-03 | 6 | -14/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618 | ||||
| * | | | BulletSim: zero vehicle motion when changing vehicle type. | Robert Adams | 2013-05-03 | 6 | -26/+18 |
| | | | | | | | | | | | | | | | | | | | | Rebuild compound linkset of any child in the linkset changes shape. Comments and better detailed logging messages. | ||||
| * | | | BulletSim: prims with no cuts created with single convex hull shape. | Robert Adams | 2013-05-02 | 4 | -2/+99 |
| | | | | | | | | | | | | | | | | Parameter added to enable/disable this feature. | ||||
| * | | | BulletSim: Rebuild physical body if physical shape changes for mesh and hull. | Robert Adams | 2013-05-02 | 4 | -24/+73 |
| | | | | | | | | | | | | | | | | | | | | Properly rebuilds collision caches. Release asset data fetched when building mesh or hulls. | ||||
| * | | | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-02 | 27 | -6362/+6369 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Make default config directory "." | BlueWall | 2013-05-01 | 2 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2013-05-01 | 24 | -6358/+6358 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-01 | 1 | -2/+3 |
| | | |\ | |||||
| | | * | | Fix SmartThreadPool line endings in recent update from dos to unix | Justin Clark-Casey (justincc) | 2013-05-01 | 24 | -6358/+6358 |
| | | | | | |||||
| | * | | | Fix inventory issue | BlueWall | 2013-05-01 | 1 | -0/+6 |
| | | |/ | | |/| | | | | | | | | | Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory. | ||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-05-01 | 33 | -4827/+6726 |
| | |\ \ | | | |/ | |||||
| | * | | Fix the long standing bug of items being delivered to lost and found or ↵ | Melanie | 2013-05-01 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission. | ||||
| * | | | BulletSim: fix crash when mesh asset wasn't available when meshing | Robert Adams | 2013-05-01 | 2 | -10/+19 |
| | | | | | | | | | | | | | | | | | | | | the first time. Debugging added for mesh/hull asset fetch. | ||||
| * | | | BulletSim: rework LinksetCompound to work with new BSShape system. | Robert Adams | 2013-05-01 | 1 | -106/+40 |
| | | | | | | | | | | | | | | | | Not all working yet. | ||||
| * | | | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-01 | 45 | -4928/+7293 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Add in-code exaplanation for the change in cancellation signalling in STP ↵ | Justin Clark-Casey (justincc) | 2013-05-01 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306 |