Melanie
d3b081744e
Prevent objects that are worn from ground from vanishing from the scene
2010-12-12 22:12:50 +01:00
Melanie
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
Justin Clark-Casey (justincc)
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
Melanie
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
Melanie
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
Melanie
7a9c57a81e
When detaching a scripted item, always consider it modified. Script states
...
will have changed and for real usability, we need to save it. It bloats
assets, but that can't be avoided.
2010-11-16 01:35:45 +01:00
Melanie
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00:00
Jeff Ames
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
Melanie
8a97d58f09
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:05:07 +00:00
Melanie
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
Melanie
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +01:00
Master ScienceSim
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
Melanie
9331898c32
Merge branch 'master' into careminster-presence-refactor
2010-10-29 20:40:48 +01:00
Master ScienceSim
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
Melanie
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
Latif Khalifa
cd4d7a7c35
A couple of more ways attachment point is sent
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com >
2010-10-15 01:56:08 -04:00
Latif Khalifa
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
Melanie
52dd547863
Make SendKillObject send multiple localIDs in one packet. This avoids the
...
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02:00
Melanie
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
Jeff Ames
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
Melanie
521e2c8355
Merge branch 'master' into careminster-presence-refactor
2010-09-30 16:01:45 +01:00
Melanie
eb58d91098
Prevent dropping someone else's attachments
2010-09-30 15:57:52 +01:00
Melanie
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
John Hurliman
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
root
512ded6eb5
Catch a nullref
2010-09-16 21:07:09 +02:00
Melanie
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
Justin Clark-Casey (justincc)
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
Justin Clark-Casey (justincc)
cd153a20b7
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
...
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
2010-09-13 21:05:03 +01:00
Justin Clark-Casey (justincc)
366de0a7b5
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
...
Doing this results in a null reference exception
2010-09-13 20:58:50 +01:00
Justin Clark-Casey (justincc)
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
Melanie
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
Jeff Ames
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
John Hurliman
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
Melanie Thielker
36cb6208b5
Fix yet another cause of "Ghost attachments"
2010-09-06 22:08:15 +01:00
Melanie Thielker
8886afd319
Fix yet another cause of "Ghost attachments"
2010-09-06 21:59:52 +02:00
Melanie
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
Justin Clark-Casey (justincc)
6cbf66827b
refactor: move SOG.AttachToAgent() into AttachmentsModule
2010-09-01 01:11:52 +01:00
Justin Clark-Casey (justincc)
01276ef433
refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly
2010-08-31 22:22:45 +01:00
Melanie
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
Justin Clark-Casey (justincc)
2b0f924557
refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments
2010-08-26 22:09:52 +01:00
Justin Clark-Casey (justincc)
f3f4428700
refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
...
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
Justin Clark-Casey (justincc)
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
Melanie
fc8d2be632
Merge branch 'master' into careminster-presence-refactor
...
This was rather conflicted. Please test linking.
2010-08-26 00:11:07 +01:00
Melanie Thielker
59af886680
Change the (hackish) constant to match the changed enum for attachs
2010-08-07 05:33:41 +01:00
Melanie Thielker
fa11ac8c85
Change the (hackish) constant to match the changed enum for attachs
2010-08-07 05:42:30 +02:00
Melanie
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
2010-07-31 00:57:50 +01:00
Justin Clark-Casey (justincc)
424b4b2b86
move attachment subscription events into AttachmentsModule from scene.
...
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
2010-07-30 21:41:44 +01:00
Justin Clark-Casey (justincc)
5b80e3fc18
convert attachments module from old region module style to new
2010-07-30 19:26:54 +01:00
Melanie Thielker
264f4f07cd
Detach attachments displaced by other attachments
2010-07-14 23:04:05 +01:00
Melanie
e1ea82b329
Major attachments cleanup. Remove unused AttachObject ClientView method
...
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:51:12 +01:00
