Mic Bowman
384cb79a1a
Merge branch 'master' into bulletsim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2011-08-19 14:49:16 -07:00
Robert Adams
bb5b396fc5
Fix exception when using BasicPhysics
2011-08-19 00:53:57 +01:00
Justin Clark-Casey (justincc)
c9e6b7bd10
Stop NPC's getting hypergrid like names in some circumstances.
...
This meant punching in another AddUser() method in IUserManagement to do a direct name to UUID associated without the account check (since NPCs don't have accounts).
May address http://opensimulator.org/mantis/view.php?id=5645
2011-08-19 00:45:22 +01:00
Robert Adams
fef73a1a10
BulletSim: add runtime setting of physics parameters. Update default values.
2011-08-18 14:32:09 -07:00
Justin Clark-Casey (justincc)
49258350e8
refactor: fold CreateSceneViewer() back into ScenePresence constructor
2011-08-18 01:22:01 +01:00
Justin Clark-Casey (justincc)
45c37ef494
refactor: Fold 3 ScenePresence() constructors into one since only one is called.
2011-08-18 01:11:23 +01:00
Justin Clark-Casey (justincc)
c1a34cd8da
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
...
This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc.
This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
2011-08-18 00:53:05 +01:00
Justin Clark-Casey (justincc)
696bd44833
Add new regression TestRezAttachmentsOnAvatarEntrance() to do simple attachments check
2011-08-17 00:37:33 +01:00
Justin Clark-Casey (justincc)
d73c424078
get rid of logged warnings about lack of some modules - afaik these never occur in real life and just clutter up tests
2011-08-16 23:12:58 +01:00
Justin Clark-Casey (justincc)
66eb537d0c
relocate AttachmentTests.cs to AttachmentsModuleTests.cs
2011-08-16 21:56:56 +01:00
Snoopy Pfeffer
9a6ad1535e
Added console command "delete object outside" to delete all objects outside region boundaries. This is especiyll useful in cases where physical objects outside regions boundaries cause much physics engine lag.
2011-08-15 17:46:51 +02:00
Justin Clark-Casey (justincc)
b3a4b10531
eliminate redundant ground sitting checks since these are already done in enclosing control structures
2011-08-11 03:16:46 +01:00
Justin Clark-Casey (justincc)
1aa1711893
eliminate the rotation parameter from SP.HandleMoveToTargetUpdate(). This can just use the currently set Rotation
...
looks like I spoke to soon about eliminating jerkiness on "go here"/autopilot. It's still there.
2011-08-11 03:06:38 +01:00
Justin Clark-Casey (justincc)
36f7d36fa1
instead of setting avatar rotation twice in SP.HandleAgentUpdate(), eliminate the second setting in AddNewMovement()
2011-08-11 02:54:15 +01:00
Justin Clark-Casey (justincc)
29093df1a7
get rid of intermediate local store of body rotation in ScenePresence, this is not used.
2011-08-11 02:36:02 +01:00
Justin Clark-Casey (justincc)
4402851b08
Get NPCs to revert to the correct 'resting' animation (e.g. stand or hover) after finishing their movement. This also fixes judder after an avatar has finished "go here"/autopilot movement in a viewer.
...
This meant reseting the SP.AgentControlFlags since the Animator uses these to determine the correct default animation.
2011-08-11 01:56:42 +01:00
Justin Clark-Casey (justincc)
951ffad81e
If SP.MoveToTarget has been called with a force walk, begin by landing the avatar.
...
There is a bug here - once an avatar has landed it glides to its new position instead of performing a walk animation
2011-08-11 00:23:54 +01:00
Justin Clark-Casey (justincc)
5d6c9644fa
early code to allow scripts to force npcs not to fly when moving to target
...
this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path.
currently implemented in osNpcMoveToTarget(), but none of this is final.
2011-08-10 01:47:37 +01:00
Justin Clark-Casey (justincc)
4cb8d6379d
Stop trying to deregister caps or close child agents when an NPC is removed
2011-08-10 00:59:31 +01:00
Justin Clark-Casey (justincc)
92e96d394a
When an NPC is created, stop telling neighbouring regions to expect a child agent
2011-08-09 23:11:07 +01:00
Justin Clark-Casey (justincc)
6878049952
get rid of bogus log message
2011-08-06 03:06:05 +01:00
Justin Clark-Casey (justincc)
eec54adac5
remove some obsolete tests that are now done elsewhere
2011-08-06 02:38:38 +01:00
Justin Clark-Casey (justincc)
e37f8cf902
Add a test to check that ScenePresence and circuit go away when a root agent is closed down
2011-08-06 02:27:25 +01:00
Justin Clark-Casey (justincc)
85e07c78fb
refactor: Change SceneHelpers.AddClient() to AddScenePresence().
...
This seems to make more sense as we can get SP.ControllingClient
2011-08-06 02:17:41 +01:00
Justin Clark-Casey (justincc)
83ba35a26b
rip out sog generation methods in ScenePresenceAgentTests and use SceneHelpers instead
...
Not that it matters, since these tests are pretty bogus anyway.
Also, renames some test classes for consistency.
2011-08-06 02:01:25 +01:00
Justin Clark-Casey (justincc)
76f46b2545
Do proper locking of m_localScenes list in SceneManager
2011-08-06 01:15:49 +01:00
Justin Clark-Casey (justincc)
dad1d6df18
rename TestHelper => TestHelpers for consistency
2011-08-06 00:31:03 +01:00
Justin Clark-Casey (justincc)
bda1a4be45
rename test SceneSetupHelpers -> SceneHelpers for consistency
2011-08-06 00:26:37 +01:00
Justin Clark-Casey (justincc)
cba40de109
extend phantom flag regression test to toggle back off
2011-08-06 00:22:14 +01:00
Justin Clark-Casey (justincc)
c6c91e6599
refactor: Fold most SOP.ScriptSet* methods back into script code. Simplify.
2011-08-06 00:13:08 +01:00
Justin Clark-Casey (justincc)
ba89fc3aa1
Add regression test for setting phantom status on a scene object. This is not yet complete.
2011-08-05 23:42:05 +01:00
Justin Clark-Casey (justincc)
94d496cf2b
remove the largely unused copy/pasted HandleAgentRequestSit() method
2011-08-05 00:57:43 +01:00
Justin Clark-Casey (justincc)
1918402cb1
if an NPC target is set to a ground location, then automatically land them when they get there.
...
This doesn't help where the target is a prim surface. In these situations, it might be better to provide manual overrides so the script can control whethre an avatar flys there/lands, etc.
2011-08-04 03:08:35 +01:00
Justin Clark-Casey (justincc)
54ce029342
if an NPC move to target is above the terrain then make it fly to destination
2011-08-04 02:31:40 +01:00
Justin Clark-Casey (justincc)
c678b75d65
if a move to target is set underground, constrain it to the terrain height
2011-08-04 01:45:56 +01:00
Justin Clark-Casey (justincc)
61a931490d
move bAllowUpdateMoveToPosition switch outside of HandleMoveToTargetUpdate()
2011-08-04 01:30:37 +01:00
Justin Clark-Casey (justincc)
831f933ce6
only call move target code in SP.HandleAgentUpdate() if we're actually in the process of moving to a position
2011-08-04 01:22:01 +01:00
Justin Clark-Casey (justincc)
7b2b47530e
move reset code out of HandleMoveToTargetUpdate() so that we only call it where needed instead of passing in a flag
2011-08-04 01:16:24 +01:00
Justin Clark-Casey (justincc)
fc64cc2439
Make SIGNIFICANT_MOVEMENT SP constant a top-level property so that other classes can use it.
2011-08-04 01:05:43 +01:00
Justin Clark-Casey (justincc)
7f6f100c5a
When the NPC reaches within the SIGNIFICANT_CLIENT_MOVEMENT distance of the target, move it directly to the target.
...
This makes the movement exact. Regression test changed to check avatar reaches exact target.
Also has the nice side effect of making NPC animations continue to work after the first movement (which wasn't working). However, avatar still pauses in mid-stride
2011-08-04 01:00:33 +01:00
Justin Clark-Casey (justincc)
ba0c65e028
extend npc move test to check a second movement
2011-08-04 00:25:51 +01:00
Justin Clark-Casey (justincc)
6f913e8caf
eliminate pre-existing unused SP.StopMovement()
2011-08-04 00:13:27 +01:00
Justin Clark-Casey (justincc)
a2f5b4ac9a
Rename HandleMoveToPositionUpdate() to HandleMoveToTargetUpdate() for consistency. Improve method doc.
2011-08-04 00:10:53 +01:00
Justin Clark-Casey (justincc)
0299cb060e
eliminate a reset position flag by using functionally equivalent DCFlagKeyPressed
2011-08-04 00:06:01 +01:00
Justin Clark-Casey (justincc)
6ab01b338f
Stop calling the SP.ResetMoveToTarget() code if a target is not actually set
2011-08-03 23:59:13 +01:00
Justin Clark-Casey (justincc)
31fb6b2d72
remove move to duck walk compensation - no longer required.
...
extends npc move to regression test to check stop after sufficient sim updates
2011-08-03 23:40:05 +01:00
Justin Clark-Casey (justincc)
a333c60f28
refactor: rename the move to position methods to move to target to be consistent with terminology used by scene object part and elsewhere
2011-08-03 22:34:05 +01:00
Justin Clark-Casey (justincc)
2964467708
get rid of vestigal move to parameters
2011-08-03 22:11:05 +01:00
Justin Clark-Casey (justincc)
6e4ec29722
Do a partial fix/implementation of OSSL osNpcMoveTo()
...
Avatar moves and stops. However, will stop in mid stride.
And if the move to position is in the air, avatar will continue to make vain and quite hilarious attempts to take off (but never doing so).
Clearly more work is needed.
2011-08-03 04:19:19 +01:00
Justin Clark-Casey (justincc)
68a5fe0431
Improve z axis move to/autopilot so the avatar does alternative crouch/huzzah when walking along the ground
...
Moving a flying avatar to a ground point doesn't yet land the avatar. This may or may not be the best thing
2011-08-03 02:59:49 +01:00