ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 09:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,055 Commits 5 Branches 96 Tags
b72dd852b7cec9b73e8038a66e06d276316845ae
Commit Graph

705 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
2a6597f61e Remove pointless Animator.TrySetMovementAnimation("STAND") in ScenePresnece constructor. 
Comment was right - it is indeed useless since SP always starts off as child and TrySetMovementAnimation screens out child SP
 2011-12-02 22:14:47 +00:00
Melanie
a8270cb48c Merge branch 'master' into bigmerge 2011-11-24 01:16:37 +00:00
Justin Clark-Casey (justincc)
b0fe0464af Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines. 
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
 2011-11-22 22:13:57 +00:00
Melanie
31736b1aac Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
b6d83e9c0f Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! 
Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789 yesterday
 2011-11-16 23:01:59 +00:00
Justin Clark-Casey (justincc)
828e4a5b09 Add comments about trying to avoid synchronous work off the EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another. 2011-11-15 20:26:42 +00:00
Justin Clark-Casey (justincc)
64784bc0cf remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead 2011-11-15 17:30:58 +00:00
Dan Lake
ed19284d85 Merge branch 'remove-scene-viewer' 2011-11-14 12:37:48 -08:00
Melanie
df35720cf5 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneViewer.cs
 2011-11-14 20:34:49 +00:00
Melanie
afca742392 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
 2011-11-14 20:03:47 +00:00
Justin Clark-Casey (justincc)
49ec85ae15 Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions 
This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791
 2011-11-14 15:24:02 +00:00
Dan Lake
5fd1749150 Remove SceneViewer from ScenePresence to reduce quadruple queueing of 
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack

Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
 2011-11-11 17:16:52 -08:00
Melanie
a4ec97cfdd Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
 2011-11-11 23:43:18 +00:00
Justin Clark-Casey (justincc)
a3052e40ad extract ground sit code into SP.HandleAgentSitOnGround() for consistency with other sitting code. 2011-11-11 23:28:32 +00:00
Justin Clark-Casey (justincc)
2a2cdaa211 As with prim sitting avatars, make an avatar phantom when it sits on the ground and solid again when it stands. 
This is to avoid http://opensimulator.org/mantis/view.php?id=5783 when a collision with a ground sitting avatar causes that avatar to automatically stand and sometimes not be able to move
A better solution may be to keep gound sitting avatars solid but remove their collision status.  However, this requires some physics code work.
 2011-11-11 23:10:43 +00:00
Justin Clark-Casey (justincc)
2a7f4e0602 remove unncessary IClientAPI parameter from SP.SendSitResponse() 2011-11-11 21:53:00 +00:00
Justin Clark-Casey (justincc)
b1cb4f5b04 As per mailing list last week, remove facility that would automatically move the avatar if prim with no sit target was out of sitting range. 
Now, no movement occurs.
Note that you can still sit on a prim with an explicit sit target from any distance, as was the case before.
 2011-11-11 21:42:58 +00:00
Justin Clark-Casey (justincc)
a658bddbcd Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing list last week. 
This means that if the avatar is within 10 meters of the selected target, it sits on it immediately without walking.
Existing autopilot outside this range will be disabled in a later commit
 2011-11-11 19:59:12 +00:00
Melanie
0daece6f2b Fix turn left and turn right properly. Works for both built-ins and LSL AOs 2011-11-10 23:42:48 +00:00
Melanie
f5abae5ac6 Implement nudging support for strafing motion 2011-11-10 23:03:05 +00:00
Melanie
008b213ec0 Fix turn left and turn right properly. Works for both built-ins and LSL AOs 2011-11-10 23:15:03 +01:00
Melanie
81fbe7ffb1 Implement nudging support for strafing motion 2011-11-10 22:34:54 +01:00
Melanie
48d2300b8a Fix misaligned sit animation on scripted sit caused by the default sit 
animation being run after the scripted one.
 2011-11-10 20:54:15 +00:00
Melanie
063920e0a2 Fix misaligned sit animation on scripted sit caused by the default sit 
animation being run after the scripted one.
 2011-11-10 20:26:14 +01:00
Melanie
d40d0e4596 Fix the ability to move the seated avatar via LSL 2011-11-08 23:15:09 +01:00
Melanie
51bad0f8ae Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-11-06 20:12:57 +00:00
Melanie
0bf757e42b Allow HG and other scene presences not linked to a user account to function. 2011-11-06 20:00:03 +00:00
Melanie
89a1d7c37c Break out the parts of ScenePresence that differ from core 2011-11-05 23:37:43 +00:00
Melanie
bd10d14bbd Fix build break 2011-11-05 23:12:00 +00:00
Melanie
57194facdc Fix up with core changes 2011-11-05 23:06:59 +00:00
Melanie
facdc9c46e Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-11-05 22:56:08 +00:00
Melanie
bbbcdaa462 Remove spammy autopilot debug 2011-11-05 22:54:47 +00:00
Melanie
71388fc02a Porting the ScenePresenceAnimator from Avination. Jump and fall anims now work 
properly.
 2011-11-05 22:41:00 +00:00
Melanie
8fb6ae379a Change m_falling public to a getter property. 2011-11-05 22:05:27 +00:00
Melanie
9c6025f928 Adapt to the core SP rework 2011-11-05 21:53:05 +00:00
Melanie
ac3254a5f5 Change puvlic m_ variable to a getter property 2011-11-05 21:43:35 +00:00
Melanie
2dc452b4a7 ScenePresence part of the Avination animator fixes. 2011-11-05 21:41:16 +00:00
Melanie
b6df9e9fe4 Chnaging the sit target adjustment to a more precise approximation of SL. Some small 
fixes ported from Avination. Some white space fixes.
 2011-11-05 21:24:36 +00:00
Melanie
0f279b1187 Some more changes to catch up with core 2011-11-05 21:23:25 +00:00
Melanie
cc8e693fb9 Remove unused and broken OffsetRotation from ScenePresence 2011-11-05 20:39:43 +00:00
Melanie
506653ff00 Some trivial changes to get closer to core 2011-11-05 20:32:20 +00:00
Melanie
1a6b2a6429 Change comment formatting to match core for a cleaner diff 2011-11-05 20:17:02 +00:00
Melanie
bda7b3dffe Replace our patched up, broken an rebroken sit code with the code from 
core which has now matured beyond what we had.
 2011-11-05 19:28:16 +01:00
Melanie
03f5bbcaf2 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-11-05 11:17:40 +00:00
Melanie
2cf6172689 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-11-05 11:05:32 +00:00
nebadon
e182cc198d Fix avatar height, removes the hip offset hack 
Author: Mana Janus <mana@mjm-labs.com>
 2011-11-05 02:56:52 -07:00
Justin Clark-Casey (justincc)
cfce2529ad refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity instead of individual components of a vector/quat 2011-11-05 02:04:48 +00:00
Justin Clark-Casey (justincc)
28c4dc9be4 Fix NPC sitting for prims without a sit target. 
This is to partially address http://opensimulator.org/mantis/view.php?id=5769
We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger.
By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>.
However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent).
Hopefully this can be addressed soon.
 2011-11-05 01:38:42 +00:00
Justin Clark-Casey (justincc)
d7815ace4a On standup, trigger the changed link script event after the avatar has been fully changed. 
This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work.
Probably the event is fired before the physics actor has been set up again for the stood avatar.
Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
 2011-11-04 23:24:22 +00:00
Melanie
b9f7aebde3 Merge branch 'master' into bigmerge 2011-11-04 23:21:19 +00:00