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,318 Commits 5 Branches 96 Tags
0369d219173fdb7ad9c19cf93d055480d80912fc
Commit Graph

730 Commits

Author SHA1 Message Date
Melanie
8cca9fe23c Allow updating the movement animation while flying. This fixes falling, 
splatting and ground sit. Walking to a ground sit still doesn't work.
 2011-10-21 03:15:56 +02:00
Melanie
fd0e65b0b1 Fix up the animator and ScenePresence to like each other again 2011-10-20 23:11:53 +02:00
Dan Lake
9ab2943abf Removed redundant NotInTransit function from ScenePresence. IsInTransit=false does the same thing and NotInTransit was not used anywhere. 2011-10-19 15:50:09 -07:00
Dan Lake
eac29396d9 Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line endings from previous commit. 2011-10-19 15:38:25 -07:00
Dan Lake
da794f34a5 Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of scene presence by client ID. 2011-10-19 14:41:44 -07:00
Justin Clark-Casey (justincc)
62a63f834b refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSitTarget() which returned exactly the same thing 2011-10-17 02:04:20 +01:00
Justin Clark-Casey (justincc)
0c041ce12f Implement osNpcSit(). This is still in development so don't trust it 
Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE)
e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE);
At the moment, sit only succeeds if the part has a sit target set.
NPC immediately sits on the target even if miles away - they do not walk up to it.
This method is in development - it may change so please don't trust it yet.
Standing will follow shortly since that's kind of important once you're sitting :)
 2011-10-17 01:42:31 +01:00
Justin Clark-Casey (justincc)
aa19ccf65c refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims. 2011-10-14 01:45:46 +01:00
Justin Clark-Casey (justincc)
f08664f422 remove some mono compiler warnings 2011-10-12 21:54:25 +01:00
Melanie
e18a76f6d6 Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge 2011-10-12 07:05:57 +01:00
Melanie
00285082d8 Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge 2011-10-12 07:05:47 +01:00
Melanie
abfb0c9399 Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge 2011-10-12 07:05:18 +01:00
Melanie
265e9d094d Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge 2011-10-12 07:02:36 +01:00
Melanie
b2090e711f Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-12 07:02:15 +01:00
Melanie
9733b64dc8 Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-12 02:02:46 +01:00
Melanie
4e88fe42e4 Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge 2011-10-12 01:42:39 +01:00
Melanie
7891433148 Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge 2011-10-11 23:16:43 +01:00
Melanie
833420e167 Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge 2011-10-11 22:42:51 +01:00
Melanie
652c59c0a9 Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge 2011-10-11 22:42:18 +01:00
Melanie
a671fcfd2c Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge 2011-10-11 22:33:58 +01:00
Melanie
6101de2316 Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:32:10 +01:00
Melanie
6e6c70be15 Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge 2011-10-11 22:24:40 +01:00
Melanie
03d533dc1e Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge 2011-10-11 22:15:25 +01:00
Melanie
341efb0942 Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge 2011-10-11 22:12:25 +01:00
Melanie
68a42af30f Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge 2011-10-11 22:11:55 +01:00
Melanie
6978ae0a59 Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-11 22:11:44 +01:00
Justin Clark-Casey (justincc)
e3c522e211 Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log message 
As per earlier discussions with dslake
 2011-10-07 20:51:26 +01:00
Dan Lake
4b46b7a5ad Fixed line endings from previous commit 2011-10-06 23:20:51 -07:00
Dan Lake
4748c19bdb Refactored "known child region" in ScenePresence. There were 4 different 
ways to access the list/dictionary of child regions and locking was
inconsistent. There are now public properties which enforce locks.
Callers are no longer required to create new copies of lists.
 2011-10-06 22:47:33 -07:00
Dan Lake
9a16e76f51 Simplified IsInTransit property on ScenePresence and removed InTransit() which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit(). 2011-10-06 12:39:19 -07:00
Dan Lake
08f264d096 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-10-06 12:22:15 -07:00
Dan Lake
bd9ba904c3 Refactor ScenePresence so gets and sets are through properties. Added private sets when needed. Removed redundant code when methods replicated what the set already does 2011-10-06 12:19:31 -07:00
Justin Clark-Casey (justincc)
ca83f99332 Instead of adding stat agentMS in all kinds of places, calculate it instead in the main Scene.Update() loop, like the other stats 
Some of the places where agentMS was added were in separate threads launched by the update loop.  I don't believe this is correct, since such threads are no longer contributing to frame time.
Some of the places were also driven by client input rather than the scene loop.  I don't believe it's appropriate to add this kind of stuff to scene loop stats.
These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time
 2011-10-06 00:45:25 +01:00
Justin Clark-Casey (justincc)
56dbab35e1 Remove unimplementated UpdateMovement() methods from SOG, SOP. 
SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase.
No point making the code more complex until it actually needs to be,
 2011-10-01 01:26:50 +01:00
Dan Lake
28a482a7ee Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-09-21 16:24:48 -07:00
Dan Lake
2c0bb8118d Commented out new debug statements in ScenePresence 2011-09-21 16:24:19 -07:00
Justin Clark-Casey (justincc)
d358125cac Reinstate option to land an npc when it reaches a target. 
This is moved into ScenePresence for now as a general facility
 2011-09-22 00:16:05 +01:00
Justin Clark-Casey (justincc)
f9438e7147 Remove unused and never set SP.PreviousRotation 2011-09-21 22:01:57 +01:00
Justin Clark-Casey (justincc)
572b680cb0 get rid of an incredibly noisy logging message from the last commit 2011-09-21 20:15:06 +01:00
Justin Clark-Casey (justincc)
c9c40343af Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-09-21 20:05:11 +01:00
Justin Clark-Casey (justincc)
8159fd7110 When calling osNpcMoveTo(), rotate the avatar in the direction of travel. 
This stops the npc walking backwards if the target is directly behind.
This means that the npc no longer returns to its original rotation once movement has finished.
If you want this behaviour, please store and reset the original rotation after movement.
This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678
 2011-09-21 19:28:41 +01:00
Dan Lake
fa9291512a Make debug statements in ScenePresence consistent and add a few more 2011-09-20 14:07:10 -07:00
Justin Clark-Casey (justincc)
385c4a210d On setting a new avatar appearance, if height hasn't changed then don't set that same height in ScenePresence. 
This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself
 2011-09-17 00:26:53 +01:00
Justin Clark-Casey (justincc)
6f542f73d4 Stop the avatar stalling on its first boarder cross when using the ODE plugin 
When upgrading the previously child agent to a root, the code was setting the Size parameter on the ODECharacter PhysicsActor.
This in turn reset Velocity, which cause the border stall.
I'm fixing this by commenting out the Velocity = Vector3.Zero lines since they don't appear to play a useful purpose
 2011-09-16 23:57:16 +01:00
Justin Clark-Casey (justincc)
adfe713b43 minor: I was wrong about OffsetPosition - sometimes it genuinely does return offset position! 
Add method doc to explain this.
 2011-09-16 22:55:24 +01:00
Justin Clark-Casey (justincc)
b2356340d2 Remove setter from SP.OffsetPosition, since all sets should flow through SP.AbsolutePosition 
OffsetPosition is also misnamed - it returns the absolute position and never contains an offset.
 2011-09-16 22:51:36 +01:00
Tom
e15917f465 Fixed a movement regression - Kitto's jump code is no longer needed (plus it's an eyesore) 2011-09-14 19:34:03 -07:00
Tom
5484c9b585 Bring us up to date. 2011-09-14 19:11:32 -07:00
Tom
cda4cd6b55 Merge fixes, and fix the build 2011-09-14 18:46:42 -07:00
Justin Clark-Casey (justincc)
bd991fc95f Don't try and delete attachments for child agent close 2011-09-13 22:54:50 +01:00