59c2cd04ba
DEBUG DEBUG DEBUG
2011-01-17 12:35:19 -08:00
d92069fb8b
Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M.
2011-01-13 04:44:04 +00:00
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00:00
ba7a227763
Revise Materials properties; Fix Double-Click Autopilot; Allow non-script sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
2011-01-04 21:36:09 +00:00
fbde9b1136
Note to self: try to make only 3 things at the same time.
2011-01-04 11:33:15 -08:00
db55859125
Guard against null Animator.
2011-01-04 11:30:08 -08:00
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
11eabf0e51
Merge branch 'master' into careminster-presence-refactor
2010-12-20 02:49:31 +00:00
d457b4c4b1
Merge branch 'master' into careminster-presence-refactor
2010-12-15 22:59:52 +00:00
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
cb51fc129e
Merge branch 'master' into careminster-presence-refactor
...
Also fix the failure to fire CHANGED_LINK on sit, which is different in our
code.
2010-12-14 12:12:27 +00:00
e47cc10674
Null checking ParentGroup is not needed. It can't be null.
2010-12-14 12:07:35 +00:00
b41164b620
This seems to get rid of the stuck PREJUMP animation, as reported by Justin in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others.
2010-12-13 21:35:40 -08:00
d2ff4ebf2d
Merge branch 'master' into careminster-presence-refactor
2010-12-13 20:19:10 +00:00
7f0350b988
Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692 .
2010-12-12 20:12:34 +01:00
663a626a6f
Apply the useful part of diva's patch that was skipped
2010-12-12 08:57:26 +00:00
797ca8d0e7
Fixes the nudge movements!
2010-12-11 17:06:17 -08:00
c42876df67
Revert "Another stab at mantis #5256"
...
This reverts commit ccb4f958c0
2010-12-10 23:32:50 -08:00
ccb4f958c0
Another stab at mantis #5256
2010-12-10 23:16:26 -08:00
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
ab2adaf341
Various bug fixes for appearance handling
2010-11-30 16:20:43 +01:00
35c6bba6d7
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:29:01 +00:00
63e2c3b2d6
Reformat an overzealous comment. Remove end of line marks and reference to the
...
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
6ed63487d9
llUnsit position fix 4063 (updated 11-20-2010)
2010-11-27 02:05:44 +00:00
a1ab2a2244
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:25:02 +00:00
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
47f0468995
Send parcel data upon becoming root. This will make streams play and build
...
flags be set properly
2010-11-18 04:18:43 +01:00
390c3a3b6f
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:18:35 +00:00
0049ec16f5
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:26:07 +01:00
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
d4d45c3acb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-16 20:47:29 +01:00
4f15b8d4e6
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
b2aeea66e3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-11 04:51:05 +00:00
9462a1861b
Fix excessive forward motion and flailing while descending a slope, prevent adding motion while falling from flying.
2010-11-11 04:49:47 +00:00
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00:00
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
7844872067
Fix merge artefacts
2010-11-05 14:46:13 +01:00
f985775962
Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
...
This reverts commit 91b1d17e5b
2010-11-05 14:27:14 +01:00
e9ec187746
Merge branch 'master' into careminster-presence-refactor
2010-11-03 00:48:18 +00:00
57eabe9d46
Actually calculate the height before setting it, this isn't done automatically
...
on incoming transfers in all cases.
2010-11-03 00:47:22 +00:00
7d551e27ca
Trying to prevent a wrong physical actor size
2010-11-03 00:01:47 +00:00
797e461ef9
Merge branch 'master' into careminster-presence-refactor
2010-11-02 23:41:13 +00:00
d555c373d8
Fix avatar height management
2010-11-02 23:39:45 +00:00
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
78a0ed3ff9
Fix sitting and standing up
2010-11-02 21:28:24 +00:00
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04:00
623cee1ffc
Move physics actor creation to after SetHeight to try and prevent
...
bowlegginess. Didn't work but is better this way anyway.
2010-10-30 19:17:52 +01:00
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
09705514ff
tweak a few more scene presence logging messages for consistency
2010-10-29 23:52:25 +01:00
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
abcde41c0d
Merge branch 'justincc-dev'
2010-10-29 23:15:35 +01:00
25e19ba7e9
add timing report to CompleteScenePresence for diagnostic purposes
2010-10-29 23:03:11 +01:00
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +01:00
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
49fa7e91b9
Clean up some cruft from the last commit. Re-add the initial update
...
send in the scene presence constructor... need to figure this out
later.
2010-10-29 13:45:59 -07:00
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
9331898c32
Merge branch 'master' into careminster-presence-refactor
2010-10-29 20:40:48 +01:00
cf78f3fae3
Comment repeated add and remove of avatars from the physical scene. It's no
...
longer needed.
2010-10-25 00:53:38 +02:00
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
b1c8d05888
Major refactoring of appearance handling.
...
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.
AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.
AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.
AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
841c84831f
Try to prevent threading issues in SP.SetAppearance by locking it
2010-09-27 19:34:16 +02:00
7df4383235
Merge branch 'master' into careminster-presence-refactor
...
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
2010-09-17 03:49:30 +01:00
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
ec89dc99b7
Some small bug fixes
2010-09-16 18:58:25 +02:00
2f41bc4ca7
Fix merge issues
2010-09-14 22:14:08 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
dd803b4f0c
minor: Add comments which explain what's going on wrt avatar movements at various points in the main scene loop and associated methods
2010-09-13 21:53:25 +01:00
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
cfaefad754
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-06 21:45:17 +00:00
c719e016ed
Falling animation fix, comment out instrumentation.
2010-09-06 21:45:07 +00:00
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
24c73aa8b2
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-02 21:51:27 +00:00
16814dd8f1
Fixes to JUMP system.
2010-09-02 21:51:19 +00:00
1c8bc9b7b6
Remove commented code and the comment, as the change has proven out
2010-09-02 21:02:09 +01:00
7720419fc7
Experimentally comment the sending of unbaked avatars
2010-09-02 20:17:49 +01:00
5ea979d515
Remove commented code and the comment, as the change has proven out
2010-09-02 20:51:27 +02:00
eea5d8368a
Experimentally comment the sending of unbaked avatars
2010-09-02 20:08:39 +02:00
9c1c378aa1
Add ScenePresence.GetAttachments(uint attachmentPoint)
2010-08-31 22:16:23 +01:00
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
7f5501d3ab
minor: remove mono compiler warning
2010-08-26 22:13:31 +01:00
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
3f942a4f74
Removed abstract SetText method from EntityBase to make cleaner API.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:37:15 +01:00
1582e05ac7
Fix a nullref issue in the AgentSetAppearance packet handler when removing the physactor from the scene
2010-08-10 09:55:40 -07:00
c2e5d1d203
Merge branch 'master' into careminster-presence-refactor
2010-08-10 19:49:35 +01:00
383ee0d647
Remove 4000+ DOS line endings. Grrr!
2010-08-10 19:48:45 +01:00
a1f2be5e69
The real fix for unscripted sit positions. This one doesn't fuck everything else up. Promise.
2010-08-07 22:25:37 -07:00
f9b5f23383
Reverted: * Fix the unscripted sit rotation being incorrect .. will commit a proper fix now.
2010-08-07 22:19:26 -07:00
aa54e8d95e
Increase sit distance to 256 meters, but leave the initial autopilot process in the picture so sit position can still be raycast by the existing code.
2010-08-07 17:35:16 -07:00
b771965f28
Get rid of some debug chatter that someone who can't spell left behind. ;)
2010-08-07 17:33:27 -07:00
acb1590cf0
Fix the unscripted sit rotation being incorrect (relative to the prim). Note that unscripted sit offset is still really poor but this is not something i'm prepared to spend time on fixing.
2010-08-07 17:32:36 -07:00
cabbd187e7
Fix the distance from which autopilot is negated when sitting on an unscripted prim - and also add some more Velocity code to ensure it gets set to zero in all cases
2010-08-07 11:13:05 -07:00
413b0525db
It seems hippo disregards velocities in full updates, so also send a terse update when an agent sits to avoid drifting off
2010-08-07 11:06:07 -07:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
120f3a18f2
Correct some script constants.
2010-08-06 15:11:18 +01:00
a636af13e7
Make sure the avatar position gets moved along with a prim it is sitting on. This fixes mantis #208 and (maybe) issues with chat and sound coming from the wrong place when sat on a vehicle.
2010-08-06 06:37:40 -07:00
c5c6627adb
Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53 .
2010-08-06 02:40:31 -07:00
847008ee07
Addresses http://opensimulator.org/mantis/view.php?id=4919
2010-08-05 09:43:19 -07:00
f1c51c8bb4
Scripted sit target fixes
2010-08-03 19:51:32 -07:00
ae99c1393d
Fix scripted sit offset in child prims
2010-08-03 15:31:04 -07:00
26621ca500
Add scripted controllers into agent intersim messaging
2010-07-11 14:50:14 +01:00
7f0f11304f
Add scripted controllers into agent intersim messaging
2010-07-11 14:26:57 +02:00
922e874653
Merge branch 'master' into careminster-presence-refactor
2010-07-11 13:32:10 +01:00
eaea89bbb7
Remove localID from script controls data. It won't transfer to another
...
region anyway
2010-07-11 13:09:11 +01:00
edcfaf60c9
Fix IMs the right way. This sets it up so that timestamps are actually
...
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
2010-07-03 20:27:00 +02:00
6274317e63
Fix loading of attachments on login
2010-06-26 06:16:24 +02:00
962dade155
Cause collisions with the avatar to be sent to attachments. Currently
...
ignores collision filter. Physics collisions are still dodgy, so we
don't get the events we should be getting.
2010-06-22 04:04:59 +02:00
9d251b1dc5
Fix the StandUp position to calculate as if we're still using the child prim id.
2010-06-20 15:57:01 -07:00
fc715a092c
Fix the sit code to ensure that we use the root prim of a linkset as a reference in the case of an avatar sitting on a child prim. This fixes various camera issues and fixes mantis #0000059 .
2010-06-20 15:38:48 -07:00
49d7d8534c
Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. This unlocks an awful lot of poseball-free content, and is a step towards resolving mantis #59 .
2010-06-19 10:06:09 -07:00
bd346ab8c7
Fixes attachments coming back upon being detached in neighbouring regions and crossing.
2010-06-13 19:18:17 -07:00
fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00
9b30f44672
D.U.H. #2 . Inverted test. Again. Argh!
2010-06-14 02:28:31 +02:00
1532dbca0a
Guard against a potential nullref
2010-06-14 00:12:39 +02:00
62763cc0fb
Report current position instead of position at the time we sat down
2010-06-14 00:02:17 +02:00
508bfa1de8
Merge branch 'master' into careminster-presence-refactor
2010-06-12 01:26:55 +01:00
c8ed972443
Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
...
we used to send before slimupdates and explicitly send it
2010-06-12 01:25:25 +01:00
6b2d2413f7
Merge branch 'master' into careminster-presence-refactor
2010-06-09 16:48:37 +01:00
ca2abc43ad
Refactor SendCoarseLocations for better performance. Instead of computing list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations.
2010-06-08 16:44:18 -07:00
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
596001632b
remove redundant ScenePresence.QueuePartForUpdate() - every place in the code calls SceneViewer.QueuePartForUpdate() directly
2010-05-28 17:53:57 +01:00
f84f0dbd51
Remove an unneeded conditional
2010-05-23 06:12:40 +01:00
72b96e8121
Add the SitGround flag back in
2010-05-23 06:12:11 +01:00
a9dad99432
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-05-23 06:09:54 +01:00
e5bcd8b341
Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628
...
This prevents a ground-sitting avatar from being moved about in mouselook
Thanks mirceakitsune!
2010-05-21 23:29:37 +01:00
93ef65c690
* Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs
...
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now
* Improved the distance and front back policies to always give your avatar the highest priority
2010-05-21 13:55:36 -07:00
297bcb5c3d
Merge branch 'master' into careminster-presence-refactor
2010-05-21 21:16:04 +01:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
b6674c9b76
Merge branch 'careminster' into careminster-presence-refactor
2010-05-21 03:03:35 +01:00
5532341bf9
Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo with kitto
2010-05-19 14:04:44 -07:00
6933b48a7e
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:49:34 -07:00
f77f9ecd8f
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:44:59 -07:00
91b1d17e5b
Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
2010-05-18 01:09:47 -07:00
bf5c81d77e
* Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
2010-05-12 15:59:48 -07:00
420dd78fb7
Merge branch 'careminster' into careminster-presence-refactor
2010-05-08 14:17:43 +01:00
add7abc1de
Fix Mouse+WASD makes Av rise; Fix PREJUMP.
2010-05-07 14:12:07 -04:00
02dea4ce58
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-06 02:02:12 +02:00
2b48ed60ec
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-05 23:41:57 +01:00
2d9a20529d
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-06 00:54:21 +02:00
733a07e061
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-06 00:34:49 +02:00
e45f5ac126
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-05 22:33:22 +01:00
2ebe148266
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
8766401777
Adapt CM to the new CHANGED_OWNER handling
2010-05-03 04:28:30 +02:00
899d521ab4
Use the saved script states
2010-04-24 18:59:34 +02:00
71f42f185a
Plumb a data path to initialize an attachment from an alternate source
2010-04-24 16:45:25 +02:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
54a5b6f434
Reduce number of AvatarAnimations sent with large number of avatars
2010-04-13 18:50:08 -07:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
0f5fb6f190
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-03-19 19:14:09 -04:00
859bc717a4
Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
2010-03-19 15:16:35 -07:00
3ea72eeabb
Fix sit with autopilot.
2010-03-19 13:26:34 -04:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
73e9b0be72
Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.
...
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
2010-03-17 11:21:27 -07:00
6df969894c
Fix AbsolutePosition for autopilot/sit.
2010-03-17 13:30:48 -04:00
a1cd3b5b88
Change GodLevel to UserLevel so gods can teleport freely without having
...
to enter god mode first
2010-03-15 17:54:39 +00:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
898fa637c3
Merge branch 'careminster' into careminster-presence-refactor
2010-03-15 17:12:08 +00:00
2ebc4be99d
add a null check in ScenePresence constructor
2010-03-13 12:04:49 -08:00
315fa06c75
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
2010-03-12 23:20:38 +00:00
689514a40a
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:12:10 +00:00
88771aeed3
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:11:28 +00:00
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
cde3c20ba3
* Fixed an order of operations bug in CheckForSignificantMovement() that was causing a flood of child updates to neighbors on login
...
* Removed an unnecessary call to the presence service
2010-03-05 17:01:31 -08:00
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
fc233d4e1e
* Adjusted the significant movement magic value from 0.5m to 2.0m and added an explanation of what it does
2010-03-03 12:34:21 -08:00
13a8d11c46
Removing the sLLVector3 dinosaur
2010-03-03 12:12:32 -08:00
a6e23a3275
* Fixed bad start position clamping in MakeRootAgent()
2010-03-03 10:59:05 -08:00
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
5c5966545d
Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there.
2010-02-28 12:07:38 -08:00
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
5c7acd0d4d
Fixes a bug in the previous patch.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-15 01:07:02 +00:00
c033223c63
Merge branch 'master' into presence-refactor
2010-02-15 00:20:48 +00:00
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
802a969267
Fix http://opensimulator.org/mantis/view.php?id=4224
...
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
2010-02-12 21:32:03 +00:00
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
1d75ad9fd5
Merge branch 'master' into presence-refactor
2010-02-08 21:54:26 +00:00
00947cf2ca
Add EventManager.OnIncomingSceneObject event which is triggered by an incoming scene object
...
Add a read-only Attachments property to ScenePresence
2010-02-08 19:02:20 +00:00
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
bf9fc69d01
minor: log what kind of wearable cannot be found
2010-02-05 19:34:25 +00:00
0a084a31e9
refactor: chain two ScenePresence constructors together to eliminate common code. No functional changes
2010-02-04 23:23:07 +00:00
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00:00
2c7672a2b9
minor: add a smidgen of EventManager doc
2010-02-03 19:27:44 +00:00
c020fed1b8
minor: comment out a log line in ScenePresence
2010-02-03 15:46:24 +00:00
da62344822
minor: remove a couple of mono warnings
2010-02-03 15:40:59 +00:00
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
72dd680dd3
Replace dome tabs with spaces
2010-01-26 14:46:53 +00:00
fe06f0dd05
Fixes Region Crossings on a prim.
2010-01-24 11:35:30 +00:00
e61f42ad3a
add a target position to agent updates to ScenePresence to support alternative client protocols
2010-01-21 23:59:04 -08:00
946e06eb58
Merge branch 'master' into careminster
2010-01-21 23:47:40 +00:00
14e62c096d
Fixes llSetDamage. Patch from Revolution
2010-01-21 23:30:49 +00:00
ee1fb81376
Finished moving object crossings into EntityTransferModule
2010-01-16 08:42:20 -08:00
bd6d1a2444
Moved prim crossing to EntityTransferModule. Not complete yet.
2010-01-16 07:46:07 -08:00
4ac3c0e81b
Renamed IAgentTransferModule to IEntityTransferModule -- accounts for objects too.
2010-01-15 17:14:48 -08:00
f1c30784ac
* General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.
...
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
2010-01-15 15:11:58 -08:00
640712fe88
* Removed debug messages.
...
* Everything works! (everything that was tested; lots of things to test)
2010-01-13 09:38:09 -08:00
66920a9047
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
2010-01-12 09:22:58 -08:00
77e43f4801
Fixed a couple of bugs with Appearance. Appearance is all good now.
2010-01-11 17:30:05 -08:00
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
0c2946031b
CommunicationsManager is practically empty. Only NetworkServersInfo is there.
2010-01-10 19:42:36 -08:00
1e1b2ab221
* OMG! All but one references to UserProfileCacheService have been rerouted!
...
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
f11a97f12d
* Finished SimulationServiceConnector
...
* Started rerouting calls to UserService.
* Compiles. May run.
2010-01-07 15:53:55 -08:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
e6c71d6df6
* Fixes Sitting on the ground.
2009-12-30 15:55:49 -05:00
16a64c400b
* Makes forward and backward key reactions faster by responding to the NUDGE type movements.
2009-12-30 15:01:14 -05:00
7371c7662a
Fix for landing points. Only one scenario is not fully covered by this change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
2009-12-26 18:14:12 +01:00
d8d6e8a304
Merge branch 'master' into casper
2009-12-21 13:29:48 +01:00
e3c1466047
Fixed a nasty crash in StandUp() that occurred when the part got killed with an avatar sitting on it.
2009-12-21 13:22:52 +01:00
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
6483470ec5
Fix GetWorldRotation(), and a host of related Sit fixes.
2009-12-17 02:54:02 -05:00
6bd087a8f9
minor: remove some mono compiler warnings
2009-12-15 16:42:42 +00:00
b8b4517211
Removed excessive call to UpdateMovementAnimations which prevented GroundSit; Corrected cause of 'sit on roof'.
2009-12-15 01:49:23 -05:00
b056c243e4
Commit partial work because of repo change
2009-12-12 10:12:59 -05:00
b310efc50f
Merge branch 'master' into careminster
2009-12-12 12:54:43 +00:00
0639e90f56
* Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."
...
* Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
2009-12-12 02:41:59 -05:00
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
2f8b9cbf2b
* Commit some sit code that's commented out for now.
2009-12-08 11:28:13 -05:00
0d1d437bd3
Fix linked physical daughter prim position update.
2009-12-06 21:11:59 +01:00
f9ae9afaac
Fix build break from conflicted merge
2009-12-06 03:10:34 +00:00
09bbfc1d56
Merge branch 'master' into careminster
2009-12-06 03:01:58 +00:00
8d196dbd14
* Adds Normal to the fields returned by the Physics Raycaster
...
* Fixes recognizing when a sit target is and isn't set.
* * 1. Vector3.Zero.
* * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION
* * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion
* * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
2009-12-05 22:18:00 -05:00
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
c4b6010fb3
* Fixes mantis 4416. Animator is dereferenced on logout
2009-12-05 13:01:21 -05:00
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
ded16d3529
Merge branch 'master' into careminster
2009-12-02 00:36:53 +00:00
475d23741d
* Fix Inconsistent line ending style in ScenePresence
2009-12-01 10:17:17 -05:00
83694e5578
* Add a close method to the ScenePresenceAnimator that dereferences the class variables and make the ScenePresence Close method call it.
2009-11-30 14:03:20 -05:00
0cb4ff1b68
* Modified ScenePresence to use the Util version of the EnvironmentTickCount method (and it's subtract method). Remove redundant EnvironmentTickCount definitions in ScenePresence.
2009-11-30 13:53:43 -05:00
69d83e1548
Merge branch 'master' into careminster
2009-11-30 08:25:40 +00:00
4338f4e1d7
* Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint.
...
* Teravus moved the Environment methods to the Util class
2009-11-29 05:06:25 -05:00
2c3f6aaa87
Merge branch 'careminster' into tests
2009-11-26 20:41:38 +01:00
5dedacca3c
First attempt at mult-sit on large single prims.
2009-11-26 20:37:08 +01:00
63b6b9cdce
Added animation support for my last commit
2009-11-26 02:35:27 +01:00
b9d22aa821
Add nudge right and left to avatar movement (faster reaction times when stepping left or right.)
2009-11-26 01:59:08 +01:00
a642968fd5
* Reverting last commit.. because it just made it worse.
2009-11-25 04:00:52 -05:00
abddb60b8d
* Attempt number 1 to stop the repeating crouch animation that sometimes happens.
...
* This tries to address it by correcting one potential bug where it never resets the falltimer.
* This tries to address it by telling Physics that we're not flying this step.. instead of waiting until the next step when the next agent update comes along.
2009-11-25 02:51:11 -05:00
32c464ad1f
Fixed animation sequencing: SitHere, Falling, Stand/Walk etc. Login Init
...
Av Animation at Stand.
2009-11-25 08:03:09 +01:00
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
31827b0286
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-11-23 04:26:42 +00:00
df121a7cd0
Merge branch 'master' into careminster
2009-11-23 04:24:58 +00:00
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
c155099faf
* The client prevents the avatar from landing if the avatar is going above an unknown certain speed, so, add a speed check on the server.
...
* This addresses the 'hump the prim' animation playing while you're moving forward full speed and pressing page down over a prim to land.
2009-11-22 19:26:00 -05:00
f1522e6204
Add non-scripted sit, fix scripted sit.
2009-11-22 08:31:35 +01:00
87bce90086
Merge branch 'master' into careminster
2009-11-22 03:14:21 +00:00
f7916d10f3
* This fixes landing on Prim and removes the hack from yesterday. Landing on prim should work fine again.
2009-11-21 19:38:38 -05:00
0149265ee8
Improved avatar responsiveness.
2009-11-21 16:50:33 +00:00
247fc00ce7
* Hack to get avatar to land on prim. This is a big nasty hack that tricks the client into thinking you're landing on the terrain. There are some visual artifacts when you land. It's only temporary until we figure out how this broke.
2009-11-21 06:39:28 -05:00
4baac71a5e
refactor: Eliminate redundant CreateSceneViewer call on ScenePresence constructors since this is also done on other called constructors
2009-11-17 18:44:57 +00:00
710a2afd12
Add scene animator set up to apparantly uncalled no-arg ScenePresence constructor
2009-11-17 16:40:59 +00:00
da255be05a
refactor: move AvatarAnimations, BinBVHAnimation
2009-11-17 16:25:52 +00:00
1324082b90
refactor: move most animation methods from ScenePresence into a new ScenePresenceAnimator class
2009-11-17 15:05:40 +00:00
2e24415077
undo previous changes
...
add a GetGroupByPrim() method to Scene.cs
delete a redundant method
2009-11-13 22:13:40 -08:00
afef1ac191
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
2009-11-05 13:10:58 -08:00
f57a646638
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-11-04 16:08:23 -08:00
ec2ebf2598
Removing EntityBase.Rotation
2009-11-04 16:08:10 -08:00
9dd5d63495
minor: remove some mono compiler warnings
2009-11-04 19:44:28 +00:00
8a73dc0f8a
* Fix for a potential race condition in ScenePresence.AbsolutePosition
...
* Unified the way region handles are stored and used in ScenePresence
* Fixed camera position for child agents
* CheckForSignificantMovement now checks avatar and camera position (both are important for scene prioritization)
* Removing debug code from the previous commit
2009-10-30 03:01:15 -07:00
aecaa51063
* Fixed a NullReferenceException in GetMovementAnimation() and added more protection against NREs in AddNewMovement()
...
* Removed the three second limit on ImprovedTerseObjectUpdate. With the latest fixes I don't think this is necessary, and it generates a lot of unnecessary updates in a crowded sim
2009-10-29 16:31:48 -07:00
2913c24c8a
* Commented out two noisy debug lines in the LLUDP server
...
* Misc. cleanup in ScenePresence.HandleAgentUpdate()
2009-10-29 15:24:31 -07:00
5c894dac8b
* Implemented foot collision plane for avatars
...
* Fixed a NullReferenceException regression
2009-10-29 05:34:40 -07:00
3f2d6fe470
Ported the Simian avatar animation system to OpenSim. Landing is currently not working
2009-10-29 04:13:51 -07:00
fd2c99f184
Fixing NullReferenceException regression in the previous commit
2009-10-29 02:10:48 -07:00
7132877075
* Log progress messages when loading OAR files with a lot of assets
...
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
2009-10-29 01:46:58 -07:00
59eb378d16
Small performance tweaks to code called by the heartbeat loop
2009-10-28 23:10:16 -07:00
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
a65c8cdc38
* Reduce the velocity tolerance on sending terse updates to avoid slowly drifting prims/avatars
...
* Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures
2009-10-28 12:45:40 -07:00
cdbeb8b83b
Track timestamps when terse updates were last sent for a prim or avatar to avoid floating away forever until a key is pressed (deviates from SL behavior in a hopefully good way)
2009-10-28 03:21:53 -07:00
d199767e69
Experimental change of PhysicsVector to Vector3. Untested
2009-10-26 18:23:43 -07:00
b6651ce790
* Double the priority on avatar bake texture requests to get avatars rezzing in faster than the surrounding scene
...
* Adds duplicate tracking for SceneObjectParts and ScenePresences to avoid sending out duplicate ImprovedTerseObjectUpdate packets
2009-10-26 18:22:32 -07:00
de25dcfb7b
Minor tweaks to get OpenSim compiling against both the current libomv and the upcoming 0.8.0
2009-10-25 01:10:02 -07:00
62f1a5e36d
Implemented a "FrontBack" prioritizer, using distance plus the plane equation to give double weight to prims/avatars in front of you
2009-10-23 02:38:59 -07:00
588361e2a2
Experimental change to use an immutable array for iterating ScenePresences, avoiding locking and copying the list each time it is accessed
2009-10-23 01:02:36 -07:00
ba2972eaf6
* Send out m_bodyRot everywhere instead of m_rotation. Still have no clue which is right
...
* Fix WorldMapModule.process() to not trip the watchdog timer
2009-10-22 14:33:54 -07:00
4ba3842d71
Forgot to hit save in the last commit
2009-10-22 13:24:24 -07:00
167d8e39fa
* Sending (position - hipoffset) instead of position
...
* Sending m_rotation instead of m_bodyRot in full updates to match terse updates (no idea which one is right!)
2009-10-22 13:14:41 -07:00
1833c69568
* Removed the unused m_agentUpdates collection and some extra work that was being done for AgentUpdate packets
...
* Start LLUDPClients unpaused (this variable is not being used yet)
2009-10-20 15:19:19 -07:00
233e16b99c
* Rewrote the methods that build ObjectUpdate and ImprovedTerseObjectUpdate packets to fill in the data more accurately and avoid allocating memory that is immediately thrown away
...
* Changed the Send*Data structs in IClientAPI to use public readonly members instead of private members and getters
* Made Parallel.ProcessorCount public
* Started switching over packet building methods in LLClientView to use Util.StringToBytes[256/1024]() instead of Utils.StringToBytes()
* More cleanup of the ScenePresences vs. ClientManager nightmare
* ScenePresence.HandleAgentUpdate() will now time out and drop incoming AgentUpdate packets after three seconds. This fixes a deadlock on m_AgentUpdates that was blocking up the LLUDP server
2009-10-18 20:24:20 -07:00
fdb2a75ad3
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
2009-10-17 18:01:22 -07:00
9c21d672d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 18:32:12 -07:00
01051daaab
* One more tweak to inform the user that they may not be able to move until relogging.
2009-10-16 21:24:08 -04:00
06354a093d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-16 10:09:19 -07:00
67afa9e633
* Make sure to unregister the OutOfBounds Physics event in RemoveFromPhysicalScene or we'll be leaking
2009-10-16 03:52:57 -04:00
ac2f98b846
* A hacky attempt at resolving mantis #4260 . I think ODE was unable to allocate memory, and therefore the unmanaged wrapper call fails or worse.. there's some unmanaged resource accounting in the ODEPlugin for ODECharacter that isn't being done properly now.
...
* The broken avatar may not be able to move, but it won't stop simulate from pressing on now. And, the simulator will try to destroy the avatar's physics proxy and recreate it again... but if this is what I think it is, it may not help.
2009-10-16 03:32:30 -04:00
4b75353cbf
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
2009-10-15 16:35:27 -07:00
d44b50ee46
* Removed some of the redundant broadcast functions in Scene and SceneGraph so it is clear who/what the broadcast is going to each time
...
* Removed two redundant parameters from SceneObjectPart
* Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs)
* Committing a preview of a new method for sending object updates efficiently (all commented out for now)
2009-10-15 15:25:02 -07:00
6d3d985511
* Request from lkalif to have the Sim send a coarselocationupdate for each avatar in the sim, including yourself.
...
* Apparently the LLClientView should have been doing this previously.. Also fixed the 'You' on the index block.. so the client doesn't display an extra green dot.
* Thanks lkalif for bringing it to our attention.
2009-10-15 02:01:29 -04:00
4790f8576c
* Replaced (possibly broken?) math for calculating the unix timestamp in MySQLAssetData with Utils.DateTimeToUnixTime()
...
* Disabled UpdateAccessTime() function since it was only writing zeros anyways. This gave me a significant performance improvement for startup times and avatar logins in standalone mode
* Load attachments asynchronously so avatars with lots of attachments don't have to race the timeout clock to login
2009-10-14 19:23:44 -07:00
8271528b1f
* comment out the velocity test, using updates every 500 ms as set in ScenePresence.AddToPhysicalScene.
...
* This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms.
* This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update.
2009-10-10 04:01:36 -04:00
3f0dc88c46
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-10-10 03:54:10 -04:00
4ffe936ba8
* Make ODECharacter respect the scene's requested collision update time
...
* Set the Scene collision update time to 500 ms
2009-10-10 03:53:53 -04:00
d7654c3bda
Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for researching this.
2009-10-10 00:26:43 -07:00
5f94889044
* Fix incorrect math on the Velocity check in PhysicsCollisionUpdate. This may reduce avatar flailing.
2009-10-10 01:49:06 -04:00
798bce592f
* Move the 'On Collision Update Movement Animation' routine to above the 'm_invulnerable' test. It doesn't fix anything but it should really be there anyway.
2009-10-10 01:16:34 -04:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
5dfd2643df
* Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes
...
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
2009-09-30 15:53:03 -07:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
56edbe9b60
Alternate algorithm for fixing avatar capsule tilt (Mantis #2905 )
...
Eliminate dynamic capsule wobble. Instead introduce a small, fixed
tilt, and allow the tilt to rotate with the avatar while moving; the
tilt always faces away from the direction of avatar movement. The
rotation while moving should eliminate direction-dependent behavior
(e.g. only being able to climb on top of prims from certain directions).
Falling animation is still too frequently invoked.
Ideally the tilt should be completely eliminated, but doing so
currently causes the avatar to fall through the terrain.
2009-09-18 11:39:08 +09:00
4241cdc929
* More comments in the RegionCombinerModule
...
* Changed the Destination ID to 0 in the TeleportFinish Event (why did we have it as 3?)
* Added border based trigger teleports
* Fix MakeRootAgent border cross tests for ensuring that the position is inside the region to use the borders to figure out if it's outside the Region
2009-09-13 07:20:18 -04:00
855fb58c96
* Moves ScenePresence SendCourseLocations to a delegate and provide a method to replace the delegate
...
* RegionCombinerModule replaces this delegate and distributes the CoarseLocationUpdates through the client connection in the region where the user would be if it was a separate region.
* Fixes Mini Map display on combined regions.
2009-09-05 02:58:35 -04:00
b997174d08
* Fix attachment cross issues with new borders.
2009-08-31 20:07:33 -04:00
9eb8c14e87
* Deal with teleports to other virtual regions in the same scene.
2009-08-28 19:42:28 -04:00
66c40dd3de
* Switch border cross tests over to the new Border class.
...
* Use List<Border> for each cardinal to allow for irregular regions.
2009-08-20 19:24:31 -04:00
de543002aa
Add Border (a virtual border management class)
...
Move Cardinals to it's own file.
2009-08-19 14:43:03 -04:00
550d0e434f
Removing the conditional for assetID=Zero upon rezzing attachments on login.
2009-08-16 19:21:19 -07:00
5d47e08dad
Removed some debug messages
2009-08-16 17:11:20 -07:00
e02062051d
Making attachments work again. Tons of debug more. This needs more testing and a lot of cleaning.
2009-08-16 16:17:19 -07:00
6b9cc6c48d
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
2009-08-13 11:30:29 -07:00
2b990a61bf
This is the second part of the 'not crash on regionsize changes'. This lets you configure region sizes to be smaller without crashing the region. I remind you that regions are still square, must be a multiple of 4, and the Linden client doesn't like anything other then 256. If you set it bigger or smaller, the terrain doesn't load in the client, the map has issues, and god forbid you connect it to a grid that expects 256m regions.
2009-08-07 20:31:48 -04:00
615e1ed285
goose panda
2009-08-06 20:04:40 +01:00
4cbf0444df
* Tweak the caps manager so that the NPCAvatar works again.
2009-08-01 14:26:00 +00:00
5c8fe5c01c
* Fixed a case where a prim was a NullPhysicsActor instead of an OdePrim
...
* Commented logic that wasn't being used.
* This should fix the errors in OdeScene.near
2009-07-21 03:18:19 +00:00
08819bcbea
* Created a way that the OpenSimulator scene can ask the physics scene to do a raycast test safely.
...
* Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see.
* Created a way to know if the user's camera is alt + cammed or just following the avatar.
* Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint)
2009-07-19 02:32:02 +00:00
f74622c65f
* Change the order of Update so Physics processes a frame before the scene manipulates the physics Scene.cs
...
* Remove the draconic locking around adding an avatar to the Scene
* Handle an extreme error case when border crossing fails and user uses map to teleport to a different region on the same instance causing control commands to go to a child agent.
* Make the Set Appearance method use the proper 'remove from physics scene' method.
* It *may* help border crossings.
* It *may* help the 'on avatar rez' lag, that people have been seeing the past week.
* It may also cause physics to crash more often on failed teleports (though.. I think I got the cases covered).
2009-07-17 07:28:09 +00:00
8e1ab33ed3
* Tweaking collision reporting a little more in ScenePresence to not check if the collisions will affect health if the avatar is invulnerable. (saves 3 loops)
2009-07-16 04:50:49 +00:00
5f68b5b82e
There was possible a locking issue in revision 9951 so reverting that revision until further testing can be done.
2009-07-16 00:05:07 +00:00
5815162d7e
minor: remove some mono compiler warnings
2009-07-15 20:49:58 +00:00
fb4067c844
A stab at implementing llSetDamage. Not persistent.
2009-07-15 00:10:01 +00:00
d8fe7777bf
Prevent teleports from ending underground
2009-07-08 08:38:23 +00:00
706286b7fb
Removed the List<NewForce> m_forceList from ScenePresence, as there wasn't any need for a list, as only the last entry in it was acted on. So it now has a single NewForce m_nextVelocity , which is updated (rather than a NewForce object being created every AgentUpdate). So as well as cutting out all the adds and clearing of the list, it also removes the creation of upto 100+ new objects per second per avatar.
2009-06-28 11:07:26 +00:00
7a2c41dea0
Extracted the code that handles the sending of prim updates to the client, from ScenePresence into ISceneViewer/SceneViewer. Currently ScenePresence "has" a ISceneViewer, although if we had a proper Node based scenegraph then it would most likely be attached directly to the nodes.
...
By extracting this code, it should make it easier to experiment with different ways of managing the update process. [Next step to make this module based, could be to create a SceneViewerFactoryModule]
2009-06-26 12:09:43 +00:00
934b291f59
Added a note to the ScenePresence.UpdateMovement() method, to remind everyone that the so called "forces" are actually velocities.
2009-06-25 13:12:48 +00:00
684286f097
Applied patch from mantis #3820 which changed the clearing of the ScenePresence.m_forcesList, so it used the List.Clear method rather than doing a loop through the list and manually removing each item. Thanks dslake.
...
I also fixed the issue where the code also loops through the m_forcesList and copies each force to the ScenePresence's movementVector. Which resulted in only the last force in the list actually be acted on. As each copy overrode the last one. So now it only copies the last force in the list.
2009-06-25 12:26:23 +00:00
a23d64dec1
Formatting cleanup.
2009-06-10 04:28:56 +00:00
840de6c036
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
5e4fc6e91e
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
...
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
2009-05-15 05:00:25 +00:00
3a28f748d5
* Adds ScenePresence.TeleportWithMomentum - same as .Teleport, but preserves velocity.
2009-05-12 21:21:33 +00:00
36dd346a91
Add a method to flush the prim update buffers once a frame, since the timer
...
appear to be too slow to be useful, or fail too fire. I may remove the timers
as a consequence if this.
2009-05-04 14:25:19 +00:00
0f721da5f1
Add a tweakable for the prim queue preload
2009-05-01 19:33:18 +00:00
52d80249d3
Throttle prim sending a bit (again) to ensure the queues don't overrun and
...
clog
2009-05-01 18:24:56 +00:00
8020af6184
Add methods to block and queue agent updates during region crossing and TP
...
This is to ensure integrity of animations and script states with regard
to controls pressed or released. No user functionality yet.
2009-05-01 17:10:42 +00:00
13c597baba
Send the animations of all already present avatar to an avatar entering a sim
...
to stop the "folded legs" on simcross
2009-05-01 16:47:53 +00:00
55a69f3f2d
Improve prim sending by combining multiple prim updates into a single packet
2009-05-01 16:29:15 +00:00
334738fca9
Thank you, mpallari, for a patch that increses efficiency by combining
...
avatar updates into a single packet.
Applied with changes.
Fixes Mantis #3136
2009-04-30 11:58:23 +00:00
6bd8e1eb99
Thank you kindly, MPallari for a patch that:
...
This patch adds few properties to ScenePresence and
thus allows region module or MRM script:
1. Force flying for avatar or,
2. Disable flying from avatar
2009-04-21 15:52:35 +00:00
aff38e2dd2
Thank you kindly, MPallari, for a patch that:
...
This patch adds new property to ScenePresence: SpeedModifier.
With this, one can modify avatars speed from region module
or MRM script.
2009-04-19 17:19:31 +00:00
722be8f132
Thank you M1sha for diagnosing and patching a lock bug affecting region crossings introduced in r9110. Fixes mantis #3456 .
2009-04-17 23:55:59 +00:00
5a0f1e9022
Prevent a nullref when no script engines are loaded
2009-04-15 23:17:25 +00:00
c2e75aecd1
* Commit a variety of fixes to bugs discovered while trying to fix the NaN singularity.
...
* WebStatsModule doesn't crash on restart. GodsModule doesn't crash when there is no Dialog Module. LLUDPServer doesn't crash when the Operation was Aborted.
* ODEPlugin does 'Almost NaN' sanity checks.
* ODEPlugin sacrifices NaN avatars to the NaN black hole to appease it and keep it from sucking the rest of the world in.
2009-04-14 01:57:35 +00:00
f6f3737fe8
Fix a regression where animations would only be sent if the avatar has
...
attachments. Convert base types to LSL types for event marshalling through
IScriptModule to avoid parameter errors.
2009-04-12 02:42:05 +00:00
217b2d93ae
Adding a script event, changed(CHANGED_ANIMATION)
...
This is sent to all root prims of all attachments of an avatar when the
animation state changes. llGetAnimation() can thenbe used to find the
new movement animation. This eliminates the need for fast timers in AOs
2009-04-11 16:51:27 +00:00
39f5dd1973
Added some null-checks to Intimidated's patch in r9024.
...
Hopefully fixes Mantis #3415 .
2009-04-06 19:12:26 +00:00
fb900f6055
Applying Intimidated's patch to fix anim handling.
...
Fixes Mantis #3417
2009-04-06 18:02:12 +00:00
2a5d38a580
Thank you, Intimidated, for a patch too fix the movement animation handling
...
Fixes Mantis #3413
2009-04-06 10:44:41 +00:00
0c544a85dc
* Fixes issue where of you force your avatar against a region corner, it gets stuck and NonFinite Avatar messages floods console
...
Addresses Mantis #3380
2009-04-03 19:20:23 +00:00
5146cb7a72
* refactor: Call StatsReporter methods directly rather than through Scene (as WebStatsModule was doing)
...
* Assume that StatsReporter is always present (possibly as a no-op impl) rather than doing null checks
2009-04-03 17:14:51 +00:00
74d5d44373
* Committing patch in mantis 3376 [Patch] Fix a minor animation handling glitch in ScenePresence
...
* ..
* ..
* err, okay, this was a stick-buggery April 1st joke by me. This removes it. Happy April 1st!
* fixes mantis 3376
2009-04-01 19:04:59 +00:00
67be0213d4
* Remove redundancies in ScenePresence
2009-03-28 02:41:51 +00:00
f5812b3702
* Adds AgentUUIDs into the CourseLocationUpdate to improve compatibility with LibOMV based clients.
...
* Modifies the IClientAPI! So client stacks will need to be modified!
2009-03-28 01:40:33 +00:00
52c482a7a7
* This updates LibOMV to the current release 0.6.0 on March 19 2009
...
* Important: HttpServer.dll was changed to HttpServer_OpenSim.dll so that the HttpServer references do not conflict if you've copied the OpenMetaverse.Http.dll and requirements to the OpenSimulator bin folder.
This means that if you reference HttpServer.dll in any projects, you will need to change the reference to HttpServer_OpenSim.dll. It still uses the Same HttpServer namespace though.
2009-03-27 22:13:09 +00:00
bce5ed5812
Moved a method GetDefaultVisualParameters from Scene to AvatarAppearance, where it belongs. Better error handling in ScenePresence.CopyFrom.
2009-03-27 20:18:55 +00:00
6323516a83
* Appearance patches suite: These patches are applied to allow libomv bots to wear outfits in the future.
...
This functionality will be upstreamed later.
** Fixed call of new AvatarAppearance without arguments, which caused bots look like clouds of gas
** Added a SendAvatarData in ScenePresence.SetAppearance, which is expected after SetAppearance is run
** Fixed AssetXferUploader: CallbackID wasn't being passed on on multiple packets asset uploads
** Set VisualParams in AvatarAppearance to stop the alien looking bot from spawning and now looks a little better.
*** TODO: Set better VisualParams value then 150 to everything
2009-03-25 20:15:46 +00:00
5af63a6a5c
Root agent retrieval via http/REST. This is a pull, the caller gets the agent. This is not used by the regions yet, but it may be a better alternative to transfer agents even when that is done by the regions. The data is still trivial; soon it will have attachments, scripts and script state. Also, authorization tokens still to come. Serialization using OSD/json, as the other methods.
2009-03-23 02:37:19 +00:00
fd9ba29a03
From: Alan M Webb <alan_webb@us.ibm.com>
...
Fix a null reference loophole in ScenePresence.
2009-03-10 15:54:00 +00:00
f9ebdee1d2
* Tweak llMoveToTarget per mantis 3265
...
* Add some comments to the Wind Module
* Add the BinBVH decoder/encoder as a scene object (to encode/decode animations programmatically).
* Add m_sitState for upcoming code to improve sit results.
2009-03-09 04:33:53 +00:00
ebe84907ae
* Fixes mantis: #3241
...
* Uses 'mouselook' or left mouse button down, to determine when to use the camera's UP axis to determine the direction of movement.
* We crouch-slide no more.
2009-03-07 01:18:59 +00:00
fc2c73d5c6
* minor: remove some mono compiler warnings
2009-03-06 21:00:15 +00:00
11e1948b57
* Replace Scene.GetLandHeight() with a straight query to Scene.Heightmap (which is used in other contexts)
2009-03-05 21:10:39 +00:00
0de34e9a18
* remove now unused serialization code
2009-03-05 18:36:37 +00:00
bdf95e54a2
A few updates necessary for load balancer.
...
- handle GetUser request for nonexistent user gracefully
- include throttle levels in ClientInfo
- code to save/restore throttles in client stack
- only update/send updates to active clients
- make animation classes serializable
2009-02-25 00:32:26 +00:00
e84ac65b58
Close-to-final tweaking with appearance. This time sending *everything*. Addresses mantis #3223 .
2009-02-24 23:06:15 +00:00
7d0790447e
From: Christopher Yeoh <yeohc@au1.ibm.com>
...
This patch fixes a bug where if a script in a child prim has taken
control of an avatar when they sit, although permission for camera
control is revoked when they stand, free camera control is not
restored. Currently it is only restored if the script is in the root
prim (though its not clear to me where this happens!).
2009-02-23 12:52:32 +00:00
05bbfd57f1
Prevent avatar from walking along z-axis
...
Thanks mirceakitsune for a patch that prevents the avatar from trying to
walk along the Z-axis in mouselook mode (or left-click the avatar and
walk) while looking up or down.
Fixes Mantis #946 .
2009-02-23 04:07:46 +00:00
20eb8e54ac
A little bit more tweaking with appearance. Now passing both the wearables and the textures referred to in the Texture faces of AvatarAppearance. The textures are still not being acted upon on the other side, but they will.
...
Note: will make avies coming from older sims casper or grey. Upgrade!
Related to mantis #3204 .
2009-02-23 00:51:31 +00:00
8f55b9d735
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
...
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
2009-02-22 20:52:55 +00:00
99b051ccbe
Addresses some issues with appearance after TPs. Appearance.Owner was not being set, and that's what's being used in SendAppearanceToOtherAgent. Mantis #3204 .
2009-02-22 01:26:11 +00:00
f1795fd9b0
Stops animations on Teleports, to conform with what the viewer does.
2009-02-18 21:28:54 +00:00
2a13e046db
Fixes height on Basic Physics in local teleports. Plus some small refactoring.
2009-02-18 20:10:40 +00:00
3f25128e77
Adds support for preserving animations on region crossings and TPs.
...
Known issue: after TP, the self client doesn't see the animations going, but others can see them. So there's a bug there (TPs only, crossings seem to be all fine).
Untested: did not test animation overriders; only tested playing animations from the viewer.
2009-02-18 01:49:18 +00:00
c381bee515
Makes SP.CopyFrom a bit more robust with respect to sims in older versions which still don't have the new appearance management code.
2009-02-17 23:46:19 +00:00
3130784934
Re-add the objectID field to the anim pack, that was deemed unneccessary
...
and dropped nonths ago, because it is required to get smooth region
crossings with AO running. Without it, in some corner cases, anims will
continue to run in an unstoppable state.
2009-02-17 04:16:42 +00:00
2c272762f8
Small change on dealing with ODE physics, so that this warning doesn't happen: "[PHYSICS]: trying to change capsule size, but the following ODE data is missing - Shell Body Amotor". That warning occurred in MakeRoot, because of the call to SetSize, immediately after making the avie physical.
2009-02-17 03:14:08 +00:00
7cc9062137
Major change to how appearance is managed, including changes in login and user service/server. Appearance is now sent by the user service/server along with all other loginparams. Regions don't query the user service for appearance anymore. The appearance is passed along from region to region as the avie moves around. And, as before, it's stored back with the user service as the client changes the avie's appearance. Child agents have default appearances that are set to the actual appearance when the avie moves to that region. (as before, child agents are invisible and non-physical).
2009-02-17 00:35:52 +00:00
312b0f91c4
More guards around SetHeight.
2009-02-15 20:02:13 +00:00
98e7ea015c
Fix exception when standing up.
...
Fixes Mantis #3170
2009-02-15 16:12:58 +00:00
9b19c65450
Guarding the new call to SetHeight in MakeRoot, so that ODE doesn't complain when it's 0.
2009-02-15 06:12:11 +00:00
52c5b75174
Moving SendInitialData sort of back to where it was before, so that it doesn't interfere with the unit tests.
2009-02-15 05:50:07 +00:00
3d5a9e6748
This started as way to correct Mantis #3158 , which I believe should be fixed now. The flying status was temporarily being ignored, which caused the avie to drop sometimes -- there was a race condition. In the process it also fixes that annoying bug in basic physics where the avie would drop half-way to the ground upon region crossings (SetAppearance was missing). Additionally, a lot of child-agent-related code has been cleaned up; namely child agents are now consistently not added to physical scenes, and they also don't have appearances. All of that happens in MakeRoot, consistently.
2009-02-15 05:00:58 +00:00
7a274a7e1d
Makes region crossings asynchronous. Moved the bulk of the original code out of ScenePresence and into SceneCommunicationService, where it should be (next to RequestTeleportToLocation). No changes in the crossing mechanism itself, yet. But this change opens the way to doing crossings as slowly as it needs to be, outside the simulator Update loop.
...
Note: weirdnesses may occur!
2009-02-12 23:23:44 +00:00
31ca3a8d4d
* refactor: Move RequestInventoryForUser() from service to CachedUserInfo
...
* This simplifies callers in most cases - CachedUserInfo is already handling the rest of the fetch inventory work anyway
2009-02-12 17:07:44 +00:00
2c685bff14
Moved prim crossing out of OGS1 and into RESTComms and LocalInterregionComms. This breaks interregion comms with older versions in what concerns prim crossing. In the process of moving the comms, a few things seem to be working better, namely this may address mantis #3011 , mantis #1698 . Hopefully, this doesn't break anything else. But I'm still seeing weirdnesses with attchments jumping out of place after a cross/TP.
...
The two most notable changes in the crossing process were:
* Object gets passed in only one message, not two as done before.
* Local object crossings do not get serialized, as done before.
2009-02-09 22:27:27 +00:00
66dc421be7
a last set of files that seem to have embedded ^M in them
2009-02-09 20:06:06 +00:00
665269a277
* Removed the duplicate AddCapsHandler that existed in ScenePresence.MakeRootAgent; CAPs are already in place when this runs.
...
* Moved MoveAgentIntoRegion further down in the CompleteMovement method.
* changed a couple of methods from protected to public in SceneCommunicationService
2009-02-08 00:54:56 +00:00
9b66108081
This changeset is the step 1 of 2 in refactoring
...
OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.
The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.
I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!
2009-02-06 16:55:34 +00:00
Diva Canto