aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-1113-59/+125
|\ | | | | | | | | | | | | | | 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-1113-57/+125
| |\
| | * 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.
| | * 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-096-9/+9
| | |
| | * Fix issue where objects removed via llDie() would not disappear for users ↵Justin Clark-Casey (justincc)2013-05-095-21/+93
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * 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-112-2/+12
| |/ | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-05-086-11/+149
|\ \ | |/ | | | | | | | | 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-084-15/+114
| | | | | | | | | | | | | | | | | | | | | | | | 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-0811-58/+1002
|\ \ | |/ | | | | | | | | | | | | 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/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-073-35/+179
| |/
| * 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-0611-268/+169
|\ \ | |/
| * 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.
* | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * 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
| | | | | | | | | | | | to be added earlier for some of the checks to work correctly.
* | | Merge branch 'master' into careminsterMelanie2013-05-0436-1659/+1407
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Merge branch 'master' into bulletsim4Robert Adams2013-05-034-20/+47
| |\ \
| | * | Fix possible race condition with local region cache if a region was added ↵Justin Clark-Casey (justincc)2013-05-031-15/+28
| | | | | | | | | | | | | | | | after startup.
| | * | 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 ↵Justin Clark-Casey (justincc)2013-05-033-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Adams2013-05-036-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 Adams2013-05-024-2/+99
| | | | | | | | | | | | | | | | | | | | Parameter added to enable/disable this feature.
| * | | | BulletSim: Rebuild physical body if physical shape changes for mesh and hull.Robert Adams2013-05-024-24/+73
| | | | | | | | | | | | | | | | | | | | | | | | | Properly rebuilds collision caches. Release asset data fetched when building mesh or hulls.
| * | | | Merge branch 'master' into bulletsim4Robert Adams2013-05-021-2/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix inventory issueBlueWall2013-05-011-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.
| * | | BulletSim: fix crash when mesh asset wasn't available when meshingRobert Adams2013-05-012-10/+19
| | | | | | | | | | | | | | | | | | | | the first time. Debugging added for mesh/hull asset fetch.
| * | | BulletSim: rework LinksetCompound to work with new BSShape system.Robert Adams2013-05-011-106/+40
| | | | | | | | | | | | | | | | Not all working yet.
| * | | Merge branch 'master' into bulletsim4Robert Adams2013-05-0110-97/+492
| |\ \ \
| * | | | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all ↵Robert Adams2013-04-305-17/+50
| | | | | | | | | | | | | | | | | | | | working yet.
| * | | | BulletSim: Add non-static BSShape.GetReference for getting another referenceRobert Adams2013-04-292-32/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to an existing shape instance. BSShapeNative rebuilds shape for all references. BSShapeCompound returns another reference copy if the compound shape already exists (for linksets).
| * | | | BulletSim: LinksetCompound work to disable collision for root andRobert Adams2013-04-291-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | child prims so compound shape can do all collisions. Don't try to build a compound linkset for non-physical linksets. Remove and replace root body when compound shape is added so collision cache is rebuilt.
| * | | | BulletSim: remove trailing white space to make git happier. No functional ↵Robert Adams2013-04-2920-152/+152
| | | | | | | | | | | | | | | | | | | | changes.
| * | | | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or ↵Robert Adams2013-04-2911-282/+282
| | | | | | | | | | | | | | | | | | | | 'm_physicsScene' to match coding conventions and reduce confusion.
| * | | | BulletSim: first cut at new linksetCompound shape building.Robert Adams2013-04-291-63/+27
| | | | |
generated by cgit v1.1 at 2024-11-18 08:23:16 +0000