3290cd09d3
remove pointless region handle paramter from IClientAPI.SendKillObject()
2013-05-09 18:12:17 +01:00
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
2b0b9f3e6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-09 18:01:49 +01:00
641c636790
minor: Simplify test setup in SceneObjectDeRezTests since permissions module doesn't need different configuration anymore
2013-05-09 16:43:16 +01:00
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
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
543d1fe70b
Guard the scene list when estates are updated
2013-05-08 21:14:52 +01:00
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
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
601aa91163
Delete "" entry for AvatarPicker cap.
2013-05-07 19:16:42 -07:00
6f5222e863
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-07 18:02:25 -07:00
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
ac6dcd35fb
Bulletsim: and the rotational friction.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-07 07:14:10 -07:00
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
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
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
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
5d5edde429
Step 2: commit the IEstateModuleInterface changes needed
2013-05-07 00:37:45 +01:00
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
93e1986d69
BulletSim: apply linear and angular friction in vehicle coordinates
...
and not world coordinates.
2013-05-06 16:48:01 -07:00
54d0cd85ad
Merge branch 'master' into careminster
2013-05-07 00:30:59 +01:00
b36e123c7f
Merge branch 'master' into careminster
2013-05-06 23:47:19 +01:00
e94b240f3d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-05-06 23:42:39 +01:00
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
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
f9fb1484aa
BulletSim: extend BSActorLockAxis to allow locking linear movement in
...
addition to angular movement. Not enabled by anything yet.
2013-05-06 13:32:22 -07:00
90f03ccd42
Added new method to Remote Admin for reloading the estate settings. This is meant to be called when some other program has changed the data on the backend.
2013-05-06 11:47:55 -07:00
a81ddf3d70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-06 09:18:17 -07:00
ad00466483
Minor reordering of operations on NewUserConnection. The agent circuit needs to be added earlier for some of the checks to work correctly.
2013-05-06 09:17:54 -07:00
cbae04ba97
Remove dumb "Region found!" message from map search
2013-05-06 06:15:47 +02:00
a8faed6f76
Implement llSetContentType using the new OpenID auth support for authentication
2013-05-05 22:01:07 +02:00
3aa83738e2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-05-04 01:22:12 +01:00
2332453974
Add RegionManager level and the ability to use literal XML to the dynamic floater module
2013-05-04 00:45:27 +02:00
4904d40138
Add llGetPhysicsMaterial
2013-05-04 00:44:47 +02:00
1ffa69f691
Merge branch 'master' into bulletsim4
2013-05-03 14:25:52 -07:00
5d25bb3084
BulletSim: zero vehicle motion when changing vehicle type.
...
Rebuild compound linkset of any child in the linkset changes shape.
Comments and better detailed logging messages.
2013-05-03 14:23:53 -07:00
5d93c99e8c
Fix possible race condition with local region cache if a region was added after startup.
2013-05-03 18:56:58 +01:00
7ca42d5711
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-03 18:51:29 +01:00
304c5d4a8b
On startup, start scenes after we're set up all local scenes, rather than 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
2013-05-03 18:48:50 +01:00
4042c82a72
BulletSim: prims with no cuts created with single convex hull shape.
...
Parameter added to enable/disable this feature.
2013-05-02 12:27:30 -07:00
d9c3947824
BulletSim: Rebuild physical body if physical shape changes for mesh and hull.
...
Properly rebuilds collision caches.
Release asset data fetched when building mesh or hulls.
2013-05-02 10:06:12 -07:00
a9480aed85
Merge branch 'master' into bulletsim4
2013-05-02 07:02:28 -07:00
4cb73192a7
Make default config directory "."
2013-05-01 23:01:33 -04:00
ed46b42fea
BulletSim: fix crash when mesh asset wasn't available when meshing
...
the first time.
Debugging added for mesh/hull asset fetch.
2013-05-01 17:16:46 -07:00
0378baed35
BulletSim: rework LinksetCompound to work with new BSShape system.
...
Not all working yet.
2013-05-01 17:15:54 -07:00
04f76af22c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-01 18:52:15 -04:00
e3d9d5566a
Fix inventory issue
...
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.
2013-05-01 18:51:43 -04:00
386d67ec61
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-01 23:02:06 +01:00
854dcd1abd
Fix SmartThreadPool line endings in recent update from dos to unix
2013-05-01 23:00:46 +01:00
8305546a02
Merge branch 'master' into careminster
2013-05-01 22:20:44 +01:00
Justin Clark-Casey (justincc)