OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,461 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

23461 Commits (e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f)

Author SHA1 Message Date
Robert Adams 03fddb301b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-14 08:49:41 -07:00
Vegaslon b135f1d58a BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you are running. 
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
 2013-05-14 08:48:40 -07:00
Diva Canto 645da54f25 Revert "HGTP-mesh bug: the mesh download requests were going to the 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 f32a21d967.
 2013-05-14 08:47:18 -07:00
Diva Canto 66c328f51b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-14 08:12:23 -07:00
Diva Canto f32a21d967 HGTP-mesh bug: the mesh download requests were going to the 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! 2013-05-14 08:12:01 -07:00
Robert Adams c86e828dbf BulletSim: add a lock to try and catch a native shape creation/destruction 
race condition.
 2013-05-13 13:30:44 -07:00
Robert Adams 15360cbb6b BulletSim: add adjustment for avatar capsule height scaling. Makes 
avatar standing on ground view better and enables tuning.
 2013-05-13 13:30:42 -07:00
Robert Adams 45f37e11ad BulletSim: use heightmap terrain when using BulletXNA. 
Output messages on features disabled when using BulletXNA.
 2013-05-13 13:30:40 -07:00
Diva Canto 4194d935ec Fixed mantis #6609 -- LoadPlugin error messages on Robust. 2013-05-13 13:07:39 -07:00
Diva Canto af1fa95875 Groups: Improve error handling on remote connector. 2013-05-13 11:36:17 -07:00
Diva Canto 25fea82049 Fixes mantis #6636 -- Groups 2013-05-13 07:29:17 -07:00
Melanie e8f4c7128f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-05-12 03:24:57 +01:00
Diva Canto a4431381fa Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs about who has permission to set home where. 2013-05-11 07:58:14 -07:00
Diva Canto ab4d530462 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-11 07:15:31 -07:00
Diva Canto 48f8b884c3 Handle SetHome properly 2013-05-11 07:15:09 -07:00
Melanie 13cd8c17d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2013-05-11 02:35:26 +01:00
Melanie 55c9bc15e5 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-05-11 01:29:30 +01:00
Melanie 81d8deb1a8 Send up the part missing from the Avination Estate commit. 
Warning - contains a small migration.
 2013-05-11 01:27:37 +01:00
Robert Adams a42bb799cc BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie 
is in a region. This fixes the high CPU usage for regions with nothing
else going on.
 2013-05-10 14:48:52 -07:00
Diva Canto a1031772eb Delete debug message 2013-05-10 08:09:26 -07:00
Justin Clark-Casey (justincc) ff0332730d Implement delete key for local console 2013-05-09 23:11:37 +01:00
Justin Clark-Casey (justincc) 292a6037ad minor: Remove unnecessary code that was generating warning in TestXInventoryDataPlugin 2013-05-09 22:48:10 +01:00
Justin Clark-Casey (justincc) 0e6ad94829 minor: Remove mono compiler warning in RemoteAdminPlugin 2013-05-09 22:44:45 +01:00
Justin Clark-Casey (justincc) 9978f36d9f Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset(). 
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
 2013-05-09 22:43:16 +01:00
Justin Clark-Casey (justincc) b4a6f2195d Only send one kill object to the deleter when they derez an object rather than two. 
Extend regression test to check this.
 2013-05-09 18:53:34 +01:00
Justin Clark-Casey (justincc) 3290cd09d3 remove pointless region handle paramter from IClientAPI.SendKillObject() 2013-05-09 18:12:17 +01:00
Justin Clark-Casey (justincc) 2cb2f1d7e3 Fix issue where objects removed via llDie() would not disappear for users 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
 2013-05-09 18:02:19 +01:00
Justin Clark-Casey (justincc) 2b0b9f3e6c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-09 18:01:49 +01:00
Justin Clark-Casey (justincc) 641c636790 minor: Simplify test setup in SceneObjectDeRezTests since permissions module doesn't need different configuration anymore 2013-05-09 16:43:16 +01:00
BlueWall 182ea00cb3 Application support: 
Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
 2013-05-09 10:50:18 -04:00
Melanie cdaceea5a6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-05-08 21:51:48 +01:00
Melanie 543d1fe70b Guard the scene list when estates are updated 2013-05-08 21:14:52 +01:00
Mic Bowman 33aaa40bee Adds an event and a method so that handling of the CachedTexture 
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).
 2013-05-08 13:13:51 -07:00
Melanie bda4565067 Merge branch 'master' into careminster 
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
 2013-05-08 20:59:44 +01:00
Diva Canto 601aa91163 Delete "" entry for AvatarPicker cap. 2013-05-07 19:16:42 -07:00
Diva Canto 6f5222e863 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-07 18:02:25 -07:00
Diva Canto e92c05ebbd Added AvatarPickerSearch capability handler. 2013-05-07 18:01:48 -07:00
Vegaslon ac6dcd35fb Bulletsim: and the rotational friction. 
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
 2013-05-07 07:14:10 -07:00
Vegaslon f247ae1a75 BulletSim: Another way to create vehicle framed friction. 
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
 2013-05-07 07:14:06 -07:00
Robert Adams ddd97cb78e BulletSim: normalize quaternian rotations when building compound linksets. 
Attempt to fix vehicles being twisted off the ground when they go physical.
 2013-05-06 18:06:34 -07:00
Robert Adams 84118c5735 BulletSim: properly free references to simple convex hull shapes. Didn't 
loose memory since shapes are shared but did mess up usage accounting.
 2013-05-06 18:05:37 -07:00
Melanie 1c6b8293d7 Step 3: Commit the Avination XEstate estate comms handler 
This adds estate-wide Teleport Home and Teleport All User Home as well
 2013-05-07 00:52:40 +01:00
Melanie 5d5edde429 Step 2: commit the IEstateModuleInterface changes needed 2013-05-07 00:37:45 +01:00
Melanie 4c83b5e719 Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually 2013-05-07 00:31:11 +01:00
Robert Adams 93e1986d69 BulletSim: apply linear and angular friction in vehicle coordinates 
and not world coordinates.
 2013-05-06 16:48:01 -07:00
Melanie 54d0cd85ad Merge branch 'master' into careminster 2013-05-07 00:30:59 +01:00
Melanie b36e123c7f Merge branch 'master' into careminster 2013-05-06 23:47:19 +01:00
Melanie e94b240f3d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-05-06 23:42:39 +01:00
Robert Adams 045aaa838a BulletSim: remove friction calcuation from BSMotor and move linear and 
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.
 2013-05-06 13:32:26 -07:00
Robert Adams bf31896983 BulletSim: simplify parameter specification by reducing the number of 
specifications required for simple properties with defaults.
 2013-05-06 13:32:24 -07:00