Melanie
|
5f6a4c4111
Merge branch 'master' into careminster
|
12 years ago |
Justin Clark-Casey (justincc)
|
4e9f50b878
Add commented log lines to FetchInventoryDescendents2 path for future use.
|
12 years ago |
Melanie
|
323b76cee4
Merge branch 'master' into bigmerge
|
13 years ago |
Melanie
|
c7dd7b13a2
Convert SendKillObject to take a list of uint rather than sending one
|
13 years ago |
Melanie
|
3cdea11e29
Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge
|
13 years ago |
Melanie
|
e43e1b49db
Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge
|
13 years ago |
Justin Clark-Casey (justincc)
|
5ddefc2564
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
|
13 years ago |
Justin Clark-Casey (justincc)
|
c93c9ea072
factor common code out into SOP.RemoveFromPhysics()
|
13 years ago |
Melanie
|
e4f3ba8610
Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge
|
13 years ago |
Melanie
|
a9af618842
Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge
|
13 years ago |
Melanie
|
ef9a811ea6
Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge
|
13 years ago |
Melanie
|
d1e681f682
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
|
13 years ago |
Dan Lake
|
92c88121c7
Removed all refs to IClientAPI from IAttachmentsModule. Separated client handlers for attachments to call public interface and rearranged module file into sections
|
13 years ago |
Dan Lake
|
460946ad62
Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still.
|
13 years ago |
Dan Lake
|
e77c919290
Remove usage of Linden packet types from inside Attachments Module and interface
|
13 years ago |
Justin Clark-Casey (justincc)
|
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
|
13 years ago |
Tom
|
1129b80629
Fix a rather stupid VS warning "The operation overflows at compile time in checked mode" - doesn't make much sense to me, but for some reason it doesn't like 256 - 6 when 256 is a constant...
|
13 years ago |
Tom
|
5484c9b585
Bring us up to date.
|
13 years ago |
Tom
|
cda4cd6b55
Merge fixes, and fix the build
|
13 years ago |
Justin Clark-Casey (justincc)
|
1084d8f6a2
Remove code from DetachSingleAttachmentToInv() that sets group changed on all parts, now that we're performing this check in UpdateKnownItem() for other purposes
|
13 years ago |
Justin Clark-Casey (justincc)
|
61affee814
remove redunant itemID and agentID arguments from UpdateKnownItem().
|
13 years ago |
Justin Clark-Casey (justincc)
|
2d62484f11
Remove UpdateKnownItem() from IAttachmentsModule.
|
13 years ago |
Justin Clark-Casey (justincc)
|
62b3e74bc5
minor: remove redundant grp != null check from AM.UpdateKnownItem()
|
13 years ago |
Justin Clark-Casey (justincc)
|
8880aea728
Stop attempts to rewear already worn items from removing and reattaching.
|
13 years ago |
Justin Clark-Casey (justincc)
|
618277e797
Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID itemID) for now
|
13 years ago |
Justin Clark-Casey (justincc)
|
ea0f78c971
Start locking entire add/remove operations on an IScenePresence.AttachmentsSyncLock object
|
13 years ago |
Justin Clark-Casey (justincc)
|
1a8f5b97b9
refactor: Make logic in AM.AttachObject() clearer by not reusing existing variables in different contexts
|
13 years ago |
Justin Clark-Casey (justincc)
|
5beee42809
rename AM.AddSceneObjectAsAttachment() to AddSceneObjectAsNewAttachmentInInv
|
13 years ago |
Justin Clark-Casey (justincc)
|
c6ec573d10
Get rid of the confusing version of IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false
|
13 years ago |
Justin Clark-Casey (justincc)
|
05a4bedc30
get rid of the unused AttachmentsModule.ShowAttachInUserInventory()
|
13 years ago |