Commit Graph

15360 Commits (307a2c61ef8106ae6aad3cd4a25c9067cdaf888a)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 87a6554d4b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Resolve merge conflicts

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
2010-08-26 00:35:03 +01:00
Justin Clark-Casey (justincc) 692cf3c657 Remove parts locking from data classes since these are using a copy of the scene object 2010-08-26 00:17:26 +01:00
Justin Clark-Casey (justincc) 166ab59420 replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway) 2010-08-26 00:15:26 +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 Thielker 47818a2db3 Fix a horrible bug in SG, where iteration of scene objects is carried
out in a fashion that causes the delegate to be invoked once per child
prim for a given group.
2010-08-26 01:06:50 +02:00
Melanie Thielker 4b47008d30 Correct whitespace 2010-08-26 00:37:54 +02: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 252e159340 Merge branch 'master' into careminster-presence-refactor 2010-08-25 23:22:23 +01:00
Melanie Thielker 75e2a2b3ce Prevent an object disposed exception that made forms comms unreliable. After
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
Melanie Thielker 604423d52b Make scene object directories more robust and prevent deleted SOP's from
sticking around
2010-08-25 23:19:30 +01:00
Melanie Thielker 739eb14741 Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
Justin Clark-Casey (justincc) 22fd00b002 minor: remove mono compiler warning 2010-08-25 23:07:43 +01:00
Justin Clark-Casey (justincc) 24d06b12c2 If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID
Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
2010-08-25 23:05:54 +01:00
Justin Clark-Casey (justincc) 46c6c35d48 refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory 2010-08-25 22:46:49 +01:00
Melanie Thielker 1096f43f0d Prevent an object disposed exception that made forms comms unreliable. After
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:34:39 +02:00
Melanie Thielker dc1baf8025 Change object cleanup again. Make scene object directories more robust and
prevent deleted SOP's from sticking around
2010-08-25 23:11:00 +02:00
Melanie Thielker 1bcb2e788f Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:04:12 +02:00
Melanie Thielker c13045b25e Correct a logic error in attachment cleanup 2010-08-25 20:11:47 +02:00
Melanie Thielker 314d1171ef Lock the attachment cleanup so it doesn't go into an endless deletion frenzy 2010-08-25 16:06:06 +02:00
Diva Canto a2113ecc71 Typo 2010-08-24 21:01:37 -07:00
Justin Clark-Casey (justincc) d69e992665 Split out actual scene object insertion code from Scene.Inventory.RezObject and move into SceneGraph.AddNewSceneObject()
The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages.
This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module
This code does not touch direct rez by a user
2010-08-24 23:25:19 +01:00
Justin Clark-Casey (justincc) 78f452050a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-24 22:29:32 +01:00
Justin Clark-Casey (justincc) 07d5a0779a refactor: make RezObject() more readable 2010-08-24 20:53:25 +01:00
Melanie ef5b628191 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-24 19:22:00 +01:00
Melanie 7296286267 Merge branch 'master' into careminster-presence-refactor 2010-08-24 19:20:43 +01:00
Marck a7a45cb22c Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attachments.
This fixes Mantis #3923.

Signed-off-by: Melanie <melanie@t-data.com>
2010-08-24 19:19:26 +01:00
Melanie Thielker 4e324ae3cb Call the cleanup after saving attachment states, so that the attachments
don't get killed before they can be saved
2010-08-24 19:07:42 +02:00
Melanie Thielker 512a13dbe7 Call the Cleanup when an agent logs out, when an agent leaves and just
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-08-24 18:52:00 +02:00
Melanie Thielker 5a05de0eec Call attachment cleanup when an agent crosses out 2010-08-24 18:38:54 +02:00
Melanie 483fc88b07 Merge branch 'master' into careminster-presence-refactor 2010-08-24 17:37:11 +01:00
Melanie Thielker b9e12ed3b7 Add a method to delete left over / dropped attachments 2010-08-24 18:20:24 +02:00
Justin Clark-Casey (justincc) 46d06b6c4c add test to check move of task item to user inventory when a target folder is explicitly given 2010-08-24 17:10:52 +01:00
Justin Clark-Casey (justincc) 8bb073d99a minor: stop test using obsolete property 2010-08-24 17:06:04 +01:00
Justin Clark-Casey (justincc) 35f719ae2f refactor TestMoveTaskInventoryItemNoParent() 2010-08-24 17:04:54 +01:00
Justin Clark-Casey (justincc) 289c21099c Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
Melanie de85aabcbe Plumb the region type through to the ProductName field in estate messages 2010-08-24 12:41:21 +01:00
Melanie 1bfec00a88 Merge branch 'master' into careminster-presence-refactor 2010-08-23 23:55:15 +01:00
Justin Clark-Casey (justincc) c72d298202 Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem. 2010-08-23 23:25:36 +01:00
Justin Clark-Casey (justincc) 1d01c91095 minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs 2010-08-23 23:21:44 +01:00
Justin Clark-Casey (justincc) 704a53fb9b Fix bug in llGiveInventory() where items were disappearing on relog
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a on 2010-05-02
2010-08-23 23:16:48 +01:00
Justin Clark-Casey (justincc) 74e5fe5aa9 Remove various warnings and improve logging messages. No functional changes. 2010-08-23 22:24:23 +01:00
meta7 8a1640f0a1 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-22 09:32:49 -07:00
meta7 46412f4931 Fix llGetLinkKey and llGetNumberOfPrims to play nice with avatars in the linkset (emulated) 2010-08-22 09:32:40 -07:00
Melanie Thielker 5c368c8d38 Refix the fix 2010-08-22 16:44:22 +02:00
Melanie Thielker 0ca771c185 Provide a better implementation of llList2Float 2010-08-22 16:23:36 +02:00
Melanie Thielker 98b2d3a7f2 Revert "Fix a typecasting issue in llList2Float. This addresses mantis #262"
This reverts commit 810840b862.

This breaks llList2Float in horrible ways. 12 hours 14 minutes becomes
1214.0 and 023.145 becomes 23145.0
Could just add the dot to fix the latter issue but that would not help
the first part. Another solution is needed.
2010-08-22 15:55:23 +02:00
Melanie Thielker 32ddeab5e3 Add printing the default script engine name. Report real exceptions when
there is an issue with the config file, as a typo could cause configuration to
silently fail.
2010-08-22 14:26:58 +02:00
Melanie Thielker 071edaff49 Suppress error messages about scripts not foind if they're in fact disabled 2010-08-22 13:51:15 +02:00
Melanie Thielker a0a25bb8ca A stab at making a better bounding box calculation 2010-08-22 13:42:29 +02:00
Melanie 8d8436e0ca Correct a minor typo 2010-08-21 20:59:25 +01:00