ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-24 23:35:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,371 Commits 5 Branches 106 Tags
bef03fb30be67dbe671dcc330558daf8a6c4bb22
Commit Graph

268 Commits

Author SHA1 Message Date
Melanie
bef03fb30b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
 2013-08-17 03:23:45 +01:00
Justin Clark-Casey (justincc)
d75f00cc2d minor: remove mono compiler warning from AttachmentsModule 2013-08-17 01:09:31 +01:00
Melanie
005c69511d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-08-07 23:29:42 +01:00
Melanie
598f63e984 Make atachment state load work again 2013-08-02 00:06:39 +01:00
Justin Clark-Casey (justincc)
c9695a0a59 Move experimental attachments throttling further down the chain so that multiple attachments changes (e.g. change outfit) are also throttled 2013-08-02 00:00:00 +01:00
Melanie
6fc03c7e6e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-08-01 23:42:19 +01:00
Justin Clark-Casey (justincc)
216e785ca9 Add experimental "debug attachments throttle <ms>" setting (command line) and ThrottlePer100PrimsRezzed in [Attachments] in config 
This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging.  A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
 2013-08-01 21:16:53 +01:00
Melanie
a7eb1b5b85 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2013-07-24 03:50:09 +01:00
Dan Lake
9f129938c9 Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene. 2013-07-16 17:43:36 -07:00
Melanie
162dfd8a38 Merge branch 'avination-current' into careminster 2013-06-11 21:03:02 +01:00
Melanie
8582b2b992 Make objects attached from the ground appear in inventory again. Fixes a number 
of interaction issues causing client crashes.
 2013-06-08 02:32:05 +02:00
Melanie
13cd8c17d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2013-05-11 02:35:26 +01:00
Justin Clark-Casey (justincc)
3290cd09d3 remove pointless region handle paramter from IClientAPI.SendKillObject() 2013-05-09 18:12:17 +01:00
Justin Clark-Casey (justincc)
69bc37acd6 minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.UpdateUserInventoryWithAttachment() 2013-04-02 01:00:55 +01:00
Melanie
64a56059b1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-30 21:19:10 +00:00
Justin Clark-Casey (justincc)
76629289f0 refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2 2013-03-29 23:59:21 +00:00
Melanie
d5d6a274a7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-29 23:28:47 +00:00
Justin Clark-Casey (justincc)
023faa227e Check viewer 2/3 attachment calls against avatar appearance attachment data rather than actually attached objects 
By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
 2013-03-29 23:10:28 +00:00
Justin Clark-Casey (justincc)
23ae4c0a4d Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments. 
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal.
This is to resolve http://opensimulator.org/mantis/view.php?id=6578
 2013-03-29 02:21:38 +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
c93f67b632 Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-29 01:58:57 +00:00
Melanie
6954024fb2 Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster 2013-03-29 01:52:29 +00:00
Melanie
120903efb6 Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-03-29 01:50:34 +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)
2b142f2f9e Add "debug attachments" console command to allow highly verbose attachment logging to be switched on and off. 
Default is off.
 2013-03-28 23:09: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
Justin Clark-Casey (justincc)
c2093ccce1 Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary. 
This is to simplify the code (no tricky 'wasChild' signalling required)
and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers)
and the viewer-side attaching the v3 viewers perform.
 2013-03-28 22:07:58 +00:00
Melanie
68b910c1ff Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-03-22 01:01:24 +00:00
Justin Clark-Casey (justincc)
3648164219 Prevent multiple instances of the same item ID being appended to an AvatarAppearance 
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
 2013-03-19 21:49:29 +00:00
Melanie
566ab7ccf9 Fix merge artefacts 2013-03-19 01:19:33 +00:00
Melanie
8553a37881 Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-19 01:00:09 +00:00
Justin Clark-Casey (justincc)
397379cd3f Process default attachment point in AttachObjectInternal before we check whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach. 2013-03-19 00:39:58 +00:00
Melanie
55ab6f015a Fix tests for multiattach 2013-03-18 23:48:03 +00:00
Melanie
5e1f651e21 Merge branch 'master' into newmultiattach 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-18 23:31:27 +00:00
Melanie
0635d9d174 Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-18 23:21:01 +00:00
Melanie
e4a70b9f9a Limit each attachment point to 5 items as per spec 2013-03-18 22:56:26 +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
Justin Clark-Casey (justincc)
3611d33b00 Improve rejection of any attempt to reattach an object that is already attached. 
This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
 2013-03-18 22:04:27 +00:00
Justin Clark-Casey (justincc)
a7a9a8a614 Fix recent regression where an item worn to an attachment point that was already occupied did not remove the previous attachment (current behaviour) 
Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013)
Added regression test for this case.
 2013-03-18 20:48:50 +00:00
Melanie
70f0587558 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-03-08 01:07:05 +00:00
Justin Clark-Casey (justincc)
6706e189d5 minor: remove some completely unused string local vars added recently in commit 984faf2 2013-03-06 23:11:32 +00:00
Melanie
339d8ef2a6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-06 00:15:54 +00:00
Melanie
81552f41c6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
 2013-03-05 23:57:53 +00:00
Justin Clark-Casey (justincc)
ccd6f443e1 Get attachment script state before taking sp.AttachmentsSyncLock() to avoid race conditions between closing agents and scripts that may be doing attachment manipulation. 
This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
 2013-03-05 23:47:36 +00:00
Melanie
9ffa08ea6b Limit each attachment point to 5 items as per spec 2013-03-05 15:11:30 +01:00
Melanie
797bfbfcfa Multiattach, part 1 2013-03-05 12:02:22 +01:00
Justin Clark-Casey (justincc)
660d36a5b0 Implement a workaround solution for saving manual script state changes by the user before logout instead of wrongly removing the script early. 
This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen.
This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
 2013-01-11 02:28:43 +00:00
Justin Clark-Casey (justincc)
05ac6d3209 Save attachments on detach/exit if a contained script state has been changed. 
This involves making Attachments module listen for start/stop script changes.
It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it
This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim.
Not just in a state where their scripts have been stopped.
 2013-01-11 01:46:36 +00:00
Melanie
e62b14024f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-04 22:39:07 +00:00
Justin Clark-Casey (justincc)
a75f24bb79 minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why we're deselecting the prim in code before scheduling an update on attachment 2013-01-03 21:06:50 +00:00