a4290cdbb3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-15 22:06:01 +01:00
177a53fbcf
Fix issue where osMakeNotecard() would fail if given a list containing vectors or quaternions.
...
http://opensimulator.org/mantis/view.php?id=6640
2013-05-15 22:04:38 +01:00
477a5e3a35
* This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z
...
* Comments describe how it filters out good, normal collisions, from 'stuck' collisions.. It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
2013-05-14 20:55:56 -04:00
799ba5aa7b
* Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection)
2013-05-14 19:17:31 -04:00
23ebae1828
Eliminate race condition where SimStatsReporter starts reporting
...
stats before the region is completely initialized.
2013-05-14 13:40:07 -07:00
df2a0fec5f
Comment out log message about looking for asset data in remove asset service for now, in order to reduce log levels in a test region with many hg origin avatars
2013-05-14 20:11:58 +01:00
ce979552fd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 19:45:35 +01:00
e9847a4dbd
Comment out some debugging item permission messages since these are highly noisy on the console.
...
Please re-enable when required
2013-05-14 19:44:41 +01:00
f8bb90d963
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 09:07:20 -07:00
91091c3e54
Second take at HGTP-mesh bug: delay sending the initial data only for agents that are coming via TP (root agents)
2013-05-14 09:06:58 -07:00
03fddb301b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:49:41 -07:00
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
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
66c328f51b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:12:23 -07:00
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
c86e828dbf
BulletSim: add a lock to try and catch a native shape creation/destruction
...
race condition.
2013-05-13 13:30:44 -07:00
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
45f37e11ad
BulletSim: use heightmap terrain when using BulletXNA.
...
Output messages on features disabled when using BulletXNA.
2013-05-13 13:30:40 -07:00
4194d935ec
Fixed mantis #6609 -- LoadPlugin error messages on Robust.
2013-05-13 13:07:39 -07:00
af1fa95875
Groups: Improve error handling on remote connector.
2013-05-13 11:36:17 -07:00
25fea82049
Fixes mantis #6636 -- Groups
2013-05-13 07:29:17 -07:00
f9daf921f7
Explicitly zero avatar velocity on sit
2013-05-13 03:29:11 +02:00
296b43f597
Small adjustments to the floater module
2013-05-13 02:15:48 +02:00
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
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
3f6071ce3a
Guard against trying to access terrain heights out of bounds. Clamp to sim.
2013-05-11 16:16:02 +02:00
8ade6fa617
Refactor to get closer to core
2013-05-11 16:15:39 +02:00
ab4d530462
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-11 07:15:31 -07:00
48f8b884c3
Handle SetHome properly
2013-05-11 07:15:09 -07:00
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
55c9bc15e5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-11 01:29:30 +01:00
81d8deb1a8
Send up the part missing from the Avination Estate commit.
...
Warning - contains a small migration.
2013-05-11 01:27:37 +01:00
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
a1031772eb
Delete debug message
2013-05-10 08:09:26 -07:00
ff0332730d
Implement delete key for local console
2013-05-09 23:11:37 +01:00
292a6037ad
minor: Remove unnecessary code that was generating warning in TestXInventoryDataPlugin
2013-05-09 22:48:10 +01:00
0e6ad94829
minor: Remove mono compiler warning in RemoteAdminPlugin
2013-05-09 22:44:45 +01:00
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
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
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
Justin Clark-Casey (justincc)