aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-142-3/+3
| |\ \ | | |/
| | * Revert "HGTP-mesh bug: the mesh download requests were going to the ↵Diva Canto2013-05-142-3/+3
| | | | | | | | | | | | | | | | | | departing sims 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!" This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
| * | BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while ↵Vegaslon2013-05-141-2/+5
| |/ | | | | | | | | | | you are running. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-144-7/+44
| |\
| | * BulletSim: add a lock to try and catch a native shape creation/destructionRobert Adams2013-05-131-2/+7
| | | | | | | | | | | | race condition.
| | * BulletSim: add adjustment for avatar capsule height scaling. MakesRobert Adams2013-05-132-4/+32
| | | | | | | | | | | | avatar standing on ground view better and enables tuning.
| | * BulletSim: use heightmap terrain when using BulletXNA.Robert Adams2013-05-132-1/+5
| | | | | | | | | | | | Output messages on features disabled when using BulletXNA.
| * | HGTP-mesh bug: the mesh download requests were going to the departing sims ↵Diva Canto2013-05-142-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 Canto2013-05-135-7/+26
| |
| * Groups: Improve error handling on remote connector.Diva Canto2013-05-131-4/+9
| |
| * Fixes mantis #6636 -- GroupsDiva Canto2013-05-132-1/+7
| |
* | Merge branch 'master' into careminsterMelanie2013-05-124-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 Canto2013-05-113-54/+19
| | | | | | | | about who has permission to set home where.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-116-5/+66
| |\
| * | Handle SetHome properlyDiva Canto2013-05-111-0/+59
| | |
| * | Delete debug messageDiva Canto2013-05-101-1/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-1127-139/+206
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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/opensimMelanie2013-05-1124-134/+191
| |\ \
| | * | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptieRobert Adams2013-05-101-2/+6
| | |/ | | | | | | | | | | | | is in a region. This fixes the high CPU usage for regions with nothing else going on.
| | * Implement delete key for local consoleJustin Clark-Casey (justincc)2013-05-091-0/+15
| | |
| | * minor: Remove unnecessary code that was generating warning in ↵Justin Clark-Casey (justincc)2013-05-091-2/+2
| | | | | | | | | | | | TestXInventoryDataPlugin
| | * 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
| | | | | | | | | | | | | | | 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-092-17/+12
| | | | | | | | | | | | | | | | | | than two. Extend regression test to check this.
| | * 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 ↵Justin Clark-Casey (justincc)2013-05-098-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/opensimJustin Clark-Casey (justincc)2013-05-094-2/+37
| | |\
| | | * Application support:BlueWall2013-05-094-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-091-10/+4
| | |/ | | | | | | | | | doesn't need different configuration anymore
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-115-3/+60
| |/ | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-05-0810-11/+208
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | 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 careminsterMelanie2013-05-0816-60/+1223
|\ \ | |/ | | | | | | | | | | | | 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
| * 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
| | | | | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| | * BulletSim: Another way to create vehicle framed friction.Vegaslon2013-05-071-3/+5
| | | | | | | | | | | | Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * | Added AvatarPickerSearch capability handler.Diva Canto2013-05-078-36/+400
| |/
| * BulletSim: normalize quaternian rotations when building compound linksets.Robert Adams2013-05-061-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'tRobert Adams2013-05-061-8/+37
| | | | | | | | loose memory since shapes are shared but did mess up usage accounting.
| * Step 3: Commit the Avination XEstate estate comms handlerMelanie2013-05-073-0/+767
| | | | | | | | This adds estate-wide Teleport Home and Teleport All User Home as well
| * Step 2: commit the IEstateModuleInterface changes neededMelanie2013-05-071-1/+2
| |
| * Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-075-27/+71
| | | | | | | | (complete module) as changes are too extensive to apply manually
* | Merge branch 'master' into careminsterMelanie2013-05-071-6/+6
|\ \ | |/
| * BulletSim: apply linear and angular friction in vehicle coordinatesRobert Adams2013-05-061-6/+6
| | | | | | | | and not world coordinates.
* | Merge branch 'master' into careminsterMelanie2013-05-0612-268/+186
|\ \ | |/
| * BulletSim: remove friction calcuation from BSMotor and move linear andRobert Adams2013-05-067-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 ofRobert Adams2013-05-062-191/+94
| | | | | | | | specifications required for simple properties with defaults.
| * BulletSim: extend BSActorLockAxis to allow locking linear movement inRobert Adams2013-05-063-10/+28
| | | | | | | | addition to angular movement. Not enabled by anything yet.
generated by cgit v1.1 at 2024-12-23 21:20:52 +0000