Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | BulletSim: add a lock to try and catch a native shape creation/destruction | Robert Adams | 2013-05-13 | 1 | -2/+7 | |
| | | | | | | | | | | | | race condition. | |||||
| | * | BulletSim: add adjustment for avatar capsule height scaling. Makes | Robert Adams | 2013-05-13 | 2 | -4/+32 | |
| | | | | | | | | | | | | avatar standing on ground view better and enables tuning. | |||||
| | * | BulletSim: use heightmap terrain when using BulletXNA. | Robert Adams | 2013-05-13 | 2 | -1/+5 | |
| | | | | | | | | | | | | Output messages on features disabled when using BulletXNA. | |||||
| * | | HGTP-mesh bug: the mesh download requests were going to the departing sims ↵ | Diva Canto | 2013-05-14 | 2 | -3/+3 | |
| |/ | | | | | | | for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up! | |||||
| * | Fixed mantis #6609 -- LoadPlugin error messages on Robust. | Diva Canto | 2013-05-13 | 5 | -7/+26 | |
| | | ||||||
| * | Groups: Improve error handling on remote connector. | Diva Canto | 2013-05-13 | 1 | -4/+9 | |
| | | ||||||
| * | Fixes mantis #6636 -- Groups | Diva Canto | 2013-05-13 | 2 | -1/+7 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-12 | 4 | -38/+50 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ↵ | Diva Canto | 2013-05-11 | 3 | -54/+19 | |
| | | | | | | | | about who has permission to set home where. | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-11 | 6 | -5/+66 | |
| |\ | ||||||
| * | | Handle SetHome properly | Diva Canto | 2013-05-11 | 1 | -0/+59 | |
| | | | ||||||
| * | | Delete debug message | Diva Canto | 2013-05-10 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-05-11 | 25 | -139/+194 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-05-11 | 22 | -134/+179 | |
| |\ \ | ||||||
| | * | | 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 | 2 | -2/+25 | |
| | |\ | ||||||
| | | * | Application support: | BlueWall | 2013-05-09 | 2 | -2/+25 | |
| | | | | | | | | | | | | | | | | 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. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 9 | -11/+205 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||||
| * | 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 | 7 | -15/+171 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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). | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 14 | -58/+1216 | |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||||
| * | 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 | 6 | -35/+393 | |
| |/ | ||||||
| * | 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 | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-07 | 1 | -6/+6 | |
|\ \ | |/ | ||||||
| * | BulletSim: apply linear and angular friction in vehicle coordinates | Robert Adams | 2013-05-06 | 1 | -6/+6 | |
| | | | | | | | | and not world coordinates. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-05-06 | 12 | -268/+186 | |
|\ \ | |/ | ||||||
| * | 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' into careminster | Melanie | 2013-05-06 | 1 | -5/+18 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-05-06 | 53 | -1793/+2102 | |
| |\ | ||||||
| * | | Minor reordering of operations on NewUserConnection. The agent circuit needs ↵ | Diva Canto | 2013-05-06 | 1 | -5/+17 | |
| | | | | | | | | | | | | to be added earlier for some of the checks to work correctly. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-05-04 | 39 | -1668/+1429 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs |