Commit Graph

27484 Commits (d02f566b4905224bc8b632235333021789cf4525)

Author SHA1 Message Date
UbitUmarov f106aea388 add debug message 2014-09-24 16:33:33 +01:00
UbitUmarov 1491ba3500 change melanies patch, reusing caps if circuit and caps path is the same.
Do the aditional cleanup, if the path did change
2014-09-24 16:01:25 +01:00
UbitUmarov 4206c1248f same thing on another lock(acd) 2014-09-24 01:51:36 +01:00
UbitUmarov d96fe6eaf5 replace a lock on a unkown origin object with a lock on a well defined
one.
2014-09-24 01:37:51 +01:00
Justin Clark-Casey (justincc) c015cb3134 Remove an unnecessary check at the bottom of Scene.CloseAgent()
At this point sp != null so no check required.
2014-09-24 00:50:24 +01:00
UbitUmarov 6d2cdd31fe populate collision lists with LinkNumber, and detected structure in
Xengine
2014-09-23 23:59:05 +01:00
UbitUmarov ac09dd9946 Merge branch 'master' into ubitworkmaster 2014-09-23 23:28:38 +01:00
Melanie Thielker 80f3e8edbc Fix stupid stuff. 2014-09-24 00:21:14 +02:00
UbitUmarov f37364b56f Merge branch 'master' into ubitworkmaster 2014-09-23 23:20:28 +01:00
Melanie Thielker a6b27a7aa4 Add a link number field to ColliderArgs 2014-09-24 00:16:04 +02:00
Melanie Thielker 309cfeff88 If an agent is logging in, rather than teleporting, make sure all known
circuits for that agent are closed.
2014-09-23 21:53:09 +02:00
Jak Daniels bde60cc92e Add persistent command history in console
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-23 10:36:00 -04:00
AliciaRaven 1e22091193 Modifications to previous IAR commits to bring them more inline with existing OpenSim code conventions. Also include new IAR save switch in console help print out. 2014-09-23 00:04:59 +01:00
AliciaRaven 5bc3bbbcf3 Add an event callback for loading IAR files. The callback for creating them already existed but not for loading. This is of interest for use by region modules. Also includes reporting numbers of items saved and items filtered to the completed log printout. 2014-09-23 00:04:53 +01:00
AliciaRaven 08675d44a7 Change existing IAR save to use UUID for its callback reference instead of Guid. This is for uniformity as discussed on IRC. 2014-09-23 00:04:50 +01:00
AliciaRaven 3bde737f76 Include same content filters for IAR file exports that already exist for OAR files. Adds new console switch --perm=CTM to save iar command. 2014-09-23 00:04:45 +01:00
UbitUmarov 992bd703e7 fix building state logic... 2014-09-23 00:04:03 +01:00
UbitUmarov 79e47eb60e some changes in link/unlink code, bypassing complex variables set methods 2014-09-22 23:32:55 +01:00
Justin Clark-Casey (justincc) c73b02d583 Replace two connecting bots state booleans in pCampbot with a single state machine.
Also adds "show status" command to pCampbot that currently just shows bot connecting state
2014-09-22 23:13:19 +01:00
Justin Clark-Casey (justincc) 8d177296ad Reinsert OpenMetaverse.dll from commit fbdf507 from an accidental replace in f1f935e
This only affected pCampbot.
2014-09-22 22:22:09 +01:00
UbitUmarov c82e456345 debug show stack trace 2014-09-22 21:13:36 +01:00
Melanie Thielker 4cc552162e Merge branch 'ubitworkmaster' 2014-09-22 18:50:06 +02:00
Melanie Thielker 0bfba122f0 When a ghosted avatar is removed, also remove any remaining CAPS 2014-09-22 18:49:08 +02:00
UbitUmarov ea4a526095 a few more changes on link/unlink 2014-09-22 16:09:39 +01:00
UbitUmarov b7fca5bcac same in a few more spots 2014-09-22 14:44:47 +01:00
UbitUmarov fe3c1b9e98 send to world or backup, after setting finding information 2014-09-22 14:32:56 +01:00
UbitUmarov bcaf202e34 update scenegraph group find by part information in sog link, so script link functions do update that also. 2014-09-22 13:59:23 +01:00
UbitUmarov e25849e1c4 remove redundant lock 2014-09-21 23:39:50 +01:00
UbitUmarov a70ed79c39 compile fix 2014-09-21 23:26:17 +01:00
UbitUmarov d1ccc6d5cc release lock a bit sooner when not needed, add a try on more complex db
store call
2014-09-21 23:23:20 +01:00
UbitUmarov f95bb53371 remove LockItemsForRead(false) without previus call with true 2014-09-21 23:02:02 +01:00
UbitUmarov adda696cd0 protect getting the item 2014-09-21 22:46:44 +01:00
UbitUmarov 51ec2d83ac remove redundant code 2014-09-21 22:43:17 +01:00
Melanie Thielker 640f3f3074 A stab at brute force fixing the locking - one, make m_itemLock volatile, two,
reset the lock even if the write lock is not apparently held.
2014-09-21 19:24:15 +02:00
Diva Canto c4cd98bc34 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-09-21 09:23:15 -07:00
Diva Canto 94619cba58 Fixed a hard-to-run-into bug in groups: at the time of creation of a group, the OwnerRoleID in the groups table was inconsistent with the roleID in the roles table. OpenSim core was not running into this bug, but 3rd party modules (like Wifi) were. 2014-09-21 09:22:32 -07:00
Robert Adams 2ed3a918bd Merge branch 'master' into bullet-2.82 2014-09-21 07:11:00 -07:00
Melanie Thielker 4002cd96a5 When sending http requests, close the response stream instead of waiting
for the finalizer to do it, if it ever does.
2014-09-20 20:42:07 +02:00
UbitUmarov 9c552212a9 exclude npcs from baked cache 2014-09-19 16:51:51 +01:00
UbitUmarov 242bb425f3 fix positions on same frames transitions 2014-09-19 01:07:20 +01:00
UbitUmarov f35f90bd72 dont give a ring to each asset request, just one to rule them all, i mean
thread not ring
2014-09-18 19:40:59 +01:00
BlueWall 519c753e46 This fixes the Scene thread renaming issue 2014-09-17 20:25:27 -04:00
BlueWall 96a2449122 Undo "Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.""
Fix for break in next commit

This reverts commit 376fab1402.
2014-09-17 20:03:54 -04:00
Justin Clark-Casey (justincc) 1f40630a9a Add eeyore to contributors 2014-09-17 23:45:53 +01:00
Edward 427240f935 Changes to be committed: modified: OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs modified: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs This solves mantis bug# 5005: llRegionSay script does not trigger ChatFromWorld event. This was solved by adding World.SimChat() command to the llRegionSay() function (per suggestion of DrCuriosity). Additionally this fixes llRegionSayTo() which was also not functioning by adding a World.SimChat() command and adding a new SimChatToAgent() overrided function to Scene.PacketHandlers.cs This is the second patch revision. Corrections made to the position of World.SimChat() and removal of tabs per suggestion by justincc. 2014-09-17 23:37:18 +01:00
BlueWall 376fab1402 Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects."
This reverts commit af286d5fcb.
Issue with Jenkins builds
2014-09-17 18:11:41 -04:00
BlueWall af286d5fcb Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects. 2014-09-17 17:56:10 -04:00
UbitUmarov 6e015125c5 Merge branch 'master' into ubitworkmaster 2014-09-17 21:48:36 +01:00
UbitUmarov ce8ea55f4e ... and a few more.. 2014-09-17 17:25:07 +01:00
UbitUmarov 060984502e and another one 2014-09-17 17:00:13 +01:00