ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-23 17:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 93 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

70 Commits

Author SHA1 Message Date
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
f7f5aba597 remove unused parameter 2015-11-17 07:59:11 +00:00
Melanie
05810e48b0 Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
 2013-03-29 02:15:47 +00:00
Melanie
6954024fb2 Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster 2013-03-29 01:52:29 +00:00
Justin Clark-Casey (justincc)
c92654fb43 Stop attempts to update/add existing attachments in user inventory when teleporting between regions. 
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
 2013-03-28 23:57:35 +00:00
Justin Clark-Casey (justincc)
4ad9b27530 If the viewer has already rezzed any attachments itself, then ignore the simulator-side rez attachments call. 
This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
 2013-03-28 22:51:59 +00:00
Melanie
fcecfc81bb Multiattach, part 1 
Conflicts:

	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-18 22:56:03 +00:00
Melanie
797bfbfcfa Multiattach, part 1 2013-03-05 12:02:22 +01:00
Melanie
23d5bafa7f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-10-03 00:24:33 +01:00
SignpostMarv
35b7c80e0b implementing osDropAttachment & osDropAttachmentAt 2012-10-02 22:14:46 +01:00
Melanie
053e7279ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-14 02:11:13 +01:00
Melanie
fe4c3a37c0 Lay some groundwork for temp attachments. Decouple attachments from inventory. 2012-08-14 00:12:15 +01:00
Melanie
e126915bc1 Change attachment handling to remove object from the scene first as per 
justincc's original work. Sample scripts before doing so. Also refactor some
crucial common code and eliminate parameters that were only ever used with
the same constant value.
 2012-07-23 21:39:26 +01:00
Melanie
9e00e2ddec Change attachment handling to remove object from the scene first as per 
justincc's original work. Sample scripts before doing so. Also refactor some
crucial common code and eliminate parameters that were only ever used with
the same constant value.
 2012-07-23 21:08:02 +02:00
Melanie
d632fd7124 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-07-12 08:55:16 +01:00
Justin Clark-Casey (justincc)
fc24563206 Add regression TestDetachScriptedAttachmentToInventory() 
This currently only does a relatively crude check for a ScriptState node in the serialized xml
 2012-07-11 21:43:35 +01:00
Melanie
6137f37028 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-06-29 22:24:53 +01:00
Justin Clark-Casey (justincc)
bfa6896678 Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG directly instead of an item ID to then shuffle through attachments, saving CPU busywork. 
Almost all callers already had the sog to hand.
Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
 2012-06-28 23:31:23 +01:00
Melanie
41a1903c60 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
 2012-06-28 03:21:08 +01:00
Justin Clark-Casey (justincc)
d043213317 refactor: Move ScenePresence <-> AgentData attachments copying code into AttachmentsModule. 2012-06-27 00:41:46 +01:00
Melanie
7cc5b3d7d3 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-06-26 17:35:55 +01:00
Justin Clark-Casey (justincc)
e5b739aaeb When attachments are being saved and deleted for a closing root agent, delete first to avoid a hud race condition with update threads. 
If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
 2012-06-25 22:48:13 +01:00
Melanie
28e5abd917 Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach positions. 2012-06-04 21:05:56 +02:00
Melanie
16aa00e944 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-02-01 10:08:45 +00:00
Melanie
241ddd031f Fix copy/paste errors 2012-02-01 09:45:15 +00:00
Melanie
e4f3ba8610 Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-12 00:10:30 +01:00
Melanie
a9af618842 Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2011-10-11 23:32:16 +01:00
Melanie
ef9a811ea6 Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
 2011-10-11 23:17:47 +01:00
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 2011-10-04 14:40:39 -07:00
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. 2011-10-03 16:44:32 -07:00
Dan Lake
e77c919290 Remove usage of Linden packet types from inside Attachments Module and interface 2011-10-03 11:55:54 -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)
2d62484f11 Remove UpdateKnownItem() from IAttachmentsModule. 
It's not appropriate for code outside the attachments module to call this.
 2011-09-13 22:27:33 +01:00
Justin Clark-Casey (justincc)
ea0f78c971 Start locking entire add/remove operations on an IScenePresence.AttachmentsSyncLock object 
Attach and detach packets are processed asynchronously when received from a viewer.
Bugs like http://opensimulator.org/mantis/view.php?id=5644 indicate that in some situations (such as attaching/detaching entire folders of objects at once), there are race conditions between these threads.
Since multiple data structures need to be updated on attach/detach, it's not enough to lock the individual collections.
Therefore, this commit introduces a new IScenePresence.AttachmentsSyncLock which add/remove operations lock on.
 2011-09-12 21:57:22 +01:00
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 2011-09-06 00:36:38 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
7d58b5fa15 move common code into AttachmentsModule.DeleteAttachmentsFromScene() 2011-08-31 17:53:58 +01:00
Justin Clark-Casey (justincc)
ddc733cd3d refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule 2011-08-30 23:32:30 +01:00
Justin Clark-Casey (justincc)
04bafd2122 refactor: Move ScenePresence.RezAttachments() into AttachmentsModule 
This adds an incomplete IScenePresence to match ISceneEntity
 2011-08-30 23:06:10 +01:00
Justin Clark-Casey (justincc)
1de68b34d9 refactor: migrate DropObject handling fully into AttachmentsModule from Scene 2011-08-30 22:25:38 +01:00
Justin Clark-Casey (justincc)
ae614c1264 refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene object group direct 2011-08-26 22:37:53 +01:00
Justin Clark-Casey (justincc)
97b207240e rename AttachmentsModule.ShowDetachInUserInventory() to DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour 2011-08-23 22:05:22 +01:00
Justin Clark-Casey (justincc)
d328046efb If an attachment fails, then start logging the exception for now, in order to help with the inconsistent state bug. 
This also refactors AttachmentsModules to stop pointlessly refetching the ScenePresence in various methods.  However, more of this is required.
 2011-08-22 23:59:48 +01:00
Justin Clark-Casey (justincc)
acfdca34fd Fix issue where loading a new appearance onto an NPC would not remove the previous attachments from the scene. 
Addresses http://opensimulator.org/mantis/view.php?id=5636
 2011-08-17 01:35:33 +01:00
Justin Clark-Casey (justincc)
e62b3dba8a reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code 
There are no functional changes.  UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
 2010-12-14 00:11:41 +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
1212cb0c74 Merge branch 'master' into careminster-presence-refactor 2010-09-14 22:03:42 +01:00