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

319 Commits

Author SHA1 Message Date
UbitUmarov
ed365f6220 remove SOP.AttachPoint, redundant( and incoerent) with SOG.AttachmentPoint 2017-01-26 19:43:00 +00:00
UbitUmarov
fe9a785ecc object Take and TakeCopy are for in scene SOPs and SPs and permitions module is NOT a shared module 2017-01-19 11:34:40 +00:00
Melanie Thielker
ff945867a3 Squelch red ink for login cancel by the user during circuit setup 2017-01-07 00:35:09 +00:00
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
ed555801a4 mantis 8013: change attachment group to active group on attach from inventory 2016-08-29 19:41:26 +01:00
UbitUmarov
d96c05a121 change my previus fix, change xengine to expect SOG and not attachments module, this way not breaking other script engines or modules out there for no valid reason 2016-08-29 12:18:01 +01:00
UbitUmarov
a4bf78fa19 mantis 8006: AttachmentModule triggered OnAttach by SOG xengine expects by SOP 2016-08-29 11:53:07 +01:00
UbitUmarov
832758df2b mantis: 8006 restrict the suspention of Trigger OnAttach to the problematic case where scripts are created, and not always as i incorrectly did before. This is still a temporary fix, other modules will not get the notification in that case. But that needs a deeper fix possible in xengine 2016-08-29 10:03:06 +01:00
UbitUmarov
b2021cf83a mantis: 8006 remove duplication of attach script events. This is a temporary fix because TriggerOnAttach will not be trigger on attachment from inventory, (for now only Xengine connects to it on core). 2016-08-28 11:28:49 +01:00
UbitUmarov
32e30afbcb actually that was redundante, already done at low level 2016-07-27 21:31:43 +01:00
UbitUmarov
8c46ab02c7 move refresh forces into applyphysics 2016-07-27 21:11:39 +01:00
Melanie Thielker
ea8f3c83bf Finally remove the requirement for an InventoryItem/FolderBase object to 
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
 2016-07-04 03:35:48 +01:00
Melanie Thielker
2c75be7f6e From information given my Mandarinka Tasty, add firing the detach event even for temp attachments 2016-04-27 00:35:30 +02:00
Melanie Thielker
6771fb7d5d Reverse a comparison, this is probably the cause of attach issues 2016-04-26 17:43:36 +02:00
Melanie Thielker
61a7566381 Fire detach events even in temp attachments. They don't really need it but keeping the tests happy 2016-04-25 20:27:23 +02:00
Melanie Thielker
8f668ec888 Stop serializing and storing assets for objects that were never rezzed from inventory items. 2016-04-25 20:02:11 +02:00
Vegaslon
46a62a37d1 Fix Temporary Attachments not being able to be detached by client 
Signed-off-by: Melanie Thielker <melanie@t-data.com>
 2016-04-25 19:44:15 +02:00
UbitUmarov
88a63ecc39 drop attachments to ground a bit in front of the avatar, not on his location 2015-12-21 18:13:07 +00:00
UbitUmarov
0e99763e6b revert the setting of phantom flag on attachment drop to ground, since it can break nomod objects 2015-12-21 13:52:45 +00:00
UbitUmarov
827058e359 drop attachments to ground with phantom active. We should not do this, but for now there no better way to avoid nasty collisions. (large physical objects may still have bad collisions with ground on drop) 2015-12-20 11:57:52 +00:00
UbitUmarov
62009ba9c0 remove some SOG references on delete to help GC 2015-12-10 14:00:43 +00:00
UbitUmarov
6c766f3ab4 remove unused parameter - missing file 2015-11-17 08:02:48 +00:00
UbitUmarov
d19e4f598f deatach from backup on attachment 2015-11-16 20:12:40 +00:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto
959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. 
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
 2015-08-08 12:12:50 -07:00
Diva Canto
96f0c6f074 More on mantis #7567. Two things: 
- Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing
- Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
 2015-06-05 10:07:50 -07:00
AliciaRaven
5e09e52ee9 Attachments Module. Fix detach event not being fired until the next time the object is attached. 
Not an ideal fix but this allows scripts such as AOs to remove animations when detached etc. The pause added does not affect other avatars or the scene in general and only pauses the avatar performing the detach for an extra 2 milliseconds.

Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-05-26 15:05:32 -07:00
Justin Clark-Casey (justincc)
1f04e1bc23 minor: In AttachmentsModule.UpdateKnownItem use the existing IInventoryAccessModule reference that other methods are already using rather than fetching its own copy. 2015-01-17 00:08:16 +00:00
Justin Clark-Casey (justincc)
e901253b49 Fix recent regression where a race condition meant SP.MakeRootAgent() would sometimes look to start attachment scripts before ETM.HandleIncomingSceneObject() had added them. 
Probably a regression since ghosts branch merge on Nov 26 2014
 2014-12-17 00:25:24 +00:00
Justin Clark-Casey (justincc)
2b9f0647de Fix a regression where objects crossing regions in the same simulator (on their own or as attachments) with AppDomainLoading = false would create the new state in the source region area rather than the dest. 
This was beause the code was finding the script DLL compiled for the source region as everything is in the same appdomain and using this as the location for the destination script state, etc.
This resolves the regression by passing the proper destination separately from the DLL retrieved.
Probably a regression since commit d7b92604 (11 July 2014).
Added regression test for this case.
At least partly addresses http://opensimulator.org/mantis/view.php?id=7278
 2014-12-10 00:25:27 +00:00
Justin Clark-Casey
4123b0fdbd minor: correct console response when setting attachments logging level 2014-11-10 23:48:59 +00:00
Justin Clark-Casey (justincc)
2a9528fa22 Don't unnecessarily remove from backup objects that were not directly attached from the scene. 
These are never in region backup in the first place since recent 11830c43
Extend regression test to check backup status.
 2014-10-02 22:30:44 +01:00
UbitUmarov
f4efa25820 remove messing with KeyframeMotion on attach 2014-09-09 03:54:27 +01:00
UbitUmarov
136749c651 drop attachments with original physical proprieties 2014-09-09 03:45:26 +01:00
UbitUmarov
93143ba012 on drop send full update on root prim, terse on others ( as sl ). Fix 
count down of number of physicial prims on attach, if removing them
 2014-09-08 23:44:29 +01:00
UbitUmarov
25b4e268a3 change attachment drop, to make object Phanton. THis is not as SL, but 
rez position is automatic and object interpenetrations will
 happen including with the avatar, with the usual ugly effects.
 2014-09-08 11:16:59 +01:00
UbitUmarov
2d352e6348 *NEEDS more testing* on attachment drop: fix adding prims to physics 
engine, remove disturbing phantom flag. On attach: fix removing prims from
physics engine, delete any keyframeMotion, remove physical flag. This is
 executed in all attachs possible only need on attach from the scene (?),
 but its where original code removed only root part from physics engine
 2014-09-08 02:19:53 +01:00
UbitUmarov
21aa325883 remove debug msgs at attachments deRez 2014-08-03 19:41:48 +01:00
UbitUmarov
6b3f10790e bugg 2014-08-03 19:35:16 +01:00
UbitUmarov
c2d9a6499a dont get script states for NPCs on deRez 2014-08-03 19:08:13 +01:00
UbitUmarov
ca8b0e6a1d replace debug msgs by others 2014-08-03 19:00:01 +01:00
Melanie Thielker
bef76bf3c5 Fix duplicate attach message being sent to objects picked up from the ground 2014-07-20 01:52:26 +02:00
Diva Canto
f7b2aa0f49 Fixed a problem with detaching attachments in situations where the user's asset server is not the same as the simulator's asset server. Unfortunately this still continues to be wasteful -- new assets are created every time an attachment is detached, but the process of storing the new asset goes through the InventoryAccess module, which does all sorts of checks regarding the users' inventory. 2014-05-22 10:16:01 -07:00
Justin Clark-Casey (justincc)
c31d93cb6f Fix issue where only one of multiple attachments on the same attachpoint for NPCs would be seen by other viewers. 
It appears that at least Singularity 1.8.5 (but probably others) rely on attachment FromItemIDs being different to display more than one.
This commit resolves this by generating random IDs instead of always using UUID.Zero for NPCs.
Resolves http://opensimulator.org/mantis/view.php?id=7110
 2014-05-01 22:24:21 +01:00
Dev Random
db83208794 Fix negative stat for Active Scripts 
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
 2014-03-22 23:02:10 -04:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
ecfb78dd16 minor: Use default(UUID) in rez attachment failure error logging rather than (UUID)null 
Patch from http://opensimulator.org/mantis/view.php?id=6843
Thanks Kira.
 2013-11-15 23:16:12 +00:00
teravus
ece2d24077 * Fixes cases where Last Attachment Point gets overwritten with 0 when it shouldn't 
* Fixes cases where Last Attachment Point doesn't get written when it should.
* Fixes Null Reference in BaseHttpServer when shutting down, null path provided.
* Drop then Wear retains Last Attachment Point
 2013-10-05 17:36:58 -05:00
Melanie
75c68fa29e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-10-04 20:03:12 +01:00