Commit Graph

20855 Commits (421071bd8a489b90d3ddd58add7135b178f59381)

Author SHA1 Message Date
UbitUmarov bb78b327c0 stop keeping references to objects on released items 2012-07-11 06:43:03 +01:00
UbitUmarov ffececaa81 Merge branch 'avination' into ubitwork 2012-07-11 04:34:44 +01:00
UbitUmarov 7c973235ab Merge branch 'avination' into ubitwork 2012-07-11 04:27:18 +01:00
UbitUmarov 7836933133 Melanie fix: detach SOGs from backup on linking 2012-07-11 03:58:58 +01:00
Melanie 0bc8238a6c Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Watchdog.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
UbitUmarov 7676ae6f74 clear released minheap items so they don't keep holding references to
objects.
2012-07-11 03:56:39 +01:00
Melanie b3910a44fa Merge branch 'ubitwork' into avination 2012-07-11 04:03:28 +02:00
Melanie ac3a2296fa Make sure handles stay intact when removing from the MinHeap 2012-07-11 04:01:20 +02:00
Justin Clark-Casey (justincc) 337ea019bd If a part has a sit target and an avatar is already sitting, allow another avatar to sit in the position given if no sit target was set.
Previous behave was that the second avatar could not sit.
This matches behaviour observed on the LL grid.
2012-07-10 23:55:22 +01:00
Justin Clark-Casey (justincc) cdea572d2e refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() and SOP.RemoveSittingAvatar() 2012-07-10 23:50:04 +01:00
Justin Clark-Casey (justincc) 11e0ad6dc8 Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"
This reverts commit c8f0d476d2.
On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly
2012-07-10 23:39:05 +01:00
Justin Clark-Casey (justincc) c8f0d476d2 refactor: Add SOP.IsSitTargetOccupied to improve readability 2012-07-10 23:34:40 +01:00
Justin Clark-Casey (justincc) 69a6f6e3cd refactor: use sit orientation argument passed in to SP.SendSitResponse() rather than creating a new copy
There are no issues with side-effects since this is a struct.
2012-07-10 23:26:40 +01:00
Justin Clark-Casey (justincc) e8347b7095 Move common code to detect whether a part has a valid sit target into a SOP property rather than being repeated in SP.
This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical.
Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero.
2012-07-10 23:21:39 +01:00
Justin Clark-Casey (justincc) 506437b684 Remove log line accidentally left in SP.SendSitResponse() 2012-07-10 23:06:34 +01:00
Justin Clark-Casey (justincc) 9f01c3d408 Disable logging in regression test in OSSL_ApiAttachmentTests 2012-07-10 23:04:44 +01:00
Justin Clark-Casey (justincc) 58869e5aa0 Fix recent SOP.GetSittingAvatars() to return null if there are no sitting avatars rather than throwing an exception.
Extends sitting avatar regression tests to test new sitters information
2012-07-10 23:03:52 +01:00
Justin Clark-Casey (justincc) f3134b5cf6 When an attachment is detached to inv or derezzed, stop the scripts, update the known item with script state still in the script engine and then remove the scripts.
This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads.
2012-07-10 22:41:11 +01:00
Justin Clark-Casey (justincc) eb5ec4a786 If a script is being stopped manually, then give the scriptpool thread 1 second to finish normally before forcibly aborting.
This is to avoid the worst of the problems in mono 2.6, 2.10 where an aborted thread does not always release all its locks.
This very short grace period is identical to the existing behaviour when a script is removed from the scene.
2012-07-10 21:42:51 +01:00
UbitUmarov b5b763f7e1 add some more memory information to StatsCollector 2012-07-10 19:13:24 +01:00
UbitUmarov 6b8b7007c4 console region restart: Let Xengine not cry all over the place with
errors also. May not be that good, but is not in use in AVN (i hope). Still safer to do a full shutdown and refire the region from a OS tool like a script, monit, etc etc
2012-07-10 18:23:38 +01:00
UbitUmarov 4a91c65dbc Merge branch 'avination' into ubitwork 2012-07-10 17:40:55 +01:00
Melanie b346e36016 Merge branch 'ubitwork' into avination 2012-07-10 17:14:42 +02:00
UbitUmarov df55de5b3d lltargetomega efective spinrate now multiplied by gain ( need check ) 2012-07-10 05:51:41 +01:00
UbitUmarov acec9da95c let SOP AngularVelocity set physics actor angular velocity if it's
physical root prim and not a vehicle. With this llSetAngularVelocity
should work and also llTargetOmega will do the same in this case.
but for now this llTargetOmega is being a normal physical rotation with
damping, and stops with selection. Thats not like SL apparently
2012-07-10 05:37:41 +01:00
UbitUmarov 652ac5f66b more work on llSetAngularVelocity() 2012-07-10 05:28:47 +01:00
UbitUmarov ca41ec9eb4 let rotationVelocity or AngularVelocity be setted on prims. Limited to
12rad/s
2012-07-10 05:11:06 +01:00
UbitUmarov 0d60568564 changed ODE lib for win32 to version 0.12 2012-07-10 01:29:44 +01:00
ubit 34f4dc29a1 change linux 32bit libode.so to ode version 0.12 2012-07-10 02:24:09 +02:00
Justin Clark-Casey (justincc) c8af20f966 This script allows an object to be attached directly from prim inventory to another avatar in the scene.
Very useful in serious game/environment scenarios where its only allowed for trusted creators.
Threat level Severe
2012-07-09 23:08:41 +01:00
Justin Clark-Casey (justincc) d6f563794e Don't allow a prim to be sat upon if its part of an attachment 2012-07-09 21:43:44 +01:00
Justin Clark-Casey (justincc) 2eaa6d5ace Do not allow a script to attach a prim if its being sat upon.
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
2012-07-09 21:24:32 +01:00
ubit 45a6d67db8 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-09 18:23:09 +02:00
UbitUmarov 3a1d46ad44 retry fixing ode getconfiguration() 2012-07-09 17:21:54 +01:00
ubit e44c735fab Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-09 18:02:27 +02:00
UbitUmarov a709768085 fix ode getconfiguration 2012-07-09 17:01:52 +01:00
ubit 6dab81aa7b Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-09 17:53:26 +02:00
UbitUmarov 0ac161c9a8 log ODE lib configuration 2012-07-09 16:51:56 +01:00
ubit e858c19a9a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-09 14:29:32 +02:00
UbitUmarov fb8e8dcbce fix ODE dispose plus minor clean. On regions restart ode.dispose seems
to be called with scene still calling simulation, that should be changed,
 for now added a check for a valid world in ode simulation
2012-07-09 13:25:17 +01:00
BlueWall 1a2ab7bc69 More keys for automated ini processing 2012-07-08 22:50:56 -04:00
Melanie 1077d7b6f5 Reinstate parallel fetching of residents and remove a left over return from debugging 2012-07-08 21:53:23 +02:00
BlueWall a96ac73302 Add more keys for OpenSim.ini.defaults automation 2012-07-08 13:45:17 -04:00
BlueWall 57094bd017 Add more automation keys to OpenSim.ini.example 2012-07-08 13:03:37 -04:00
ubit eeca3db642 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-08 15:03:13 +02:00
UbitUmarov b74d4711bb Merge branch 'avination' into ubitwork 2012-07-08 13:09:32 +01:00
Melanie 1e4c656497 Revamp map block sending to eliminate overload of the grid server connection
and the sim's http client
2012-07-08 10:44:53 +02:00
Melanie 73c5a6e666 Instead of sending 20 records in 2 packets, send just one as we intended in the first place. 2012-07-08 07:42:40 +02:00
Melanie d3b778ebbe Address map lag issue seen with non-avination viewers 2012-07-08 06:06:33 +02:00
Melanie 470019b52a Change semantics of FromXML on vehicle data to make the serializer a bit cleaner 2012-07-07 19:59:55 +02:00