ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-05 10:35:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,849 Commits 5 Branches 96 Tags
68ece236a6cd8a2a9bc009287e43debdc6e9a79d
Commit Graph

564 Commits

Author SHA1 Message Date
Melanie
a5d969d92f Comment out asset error for sculpts/meshes. If an asset is missing it's missing. 
We can't put it back so we don't need to know.
 2012-09-23 20:57:36 +02:00
UbitUmarov
a7281003d8 move keyframemotion.copy from sop.copy to sog.copy, where there is 
newgroup information avaiable.
 2012-08-30 01:30:56 +01:00
UbitUmarov
c821153a4f [possible still bad] make use of keyframemotion.copy on sop.copy, replacing 
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
 2012-08-30 00:15:46 +01:00
UbitUmarov
ef6e007a4c [possible still very broken] mess around keyframes. timer events 
threads overlaps, some null objects exceptions, region crossing...
 2012-08-28 03:21:03 +01:00
Melanie
c1a0c7fad1 Fix bad child prim permissions that can make objects change perms after rezzing 2012-08-23 23:09:32 +02:00
Melanie
0c00abcce1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-08-03 16:46:11 +01:00
SignpostMarv
cd9fd77e2c ImprovedTerseObjectUpdate packet does not support shape updates, thus scheduling terse updates will not (and does not) update shape information in the viewer 2012-08-03 01:55:46 +01:00
UbitUmarov
d5f4fb7b50 Merge branch 'avination' into ubitwork 2012-07-17 00:54:23 +01:00
UbitUmarov
1dca94c72f don't subscribe collision events for nonphysical parts only because of 
collision sounds. Let them be passive
 2012-07-14 20:10:38 +01:00
Melanie
d632fd7124 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-07-12 08:55:16 +01:00
Robert Adams
743437262e Many explanitory comments added to the link and delink code in 
SOG and SOP. Should have no functionality changes.
 2012-07-11 16:12:38 -07:00
Melanie
906ac4adc4 Revert "Add instrumentation to log finalizer being called. Suppressed for backup" 
This reverts commit ea91a36483.
 2012-07-12 01:01:43 +02:00
Melanie
ea91a36483 Add instrumentation to log finalizer being called. Suppressed for backup 
interim copies to avoid spammage. Not for release to the grid, must be
reverted first!
 2012-07-11 23:33:13 +02:00
Melanie
89c9528e38 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-07-11 14:27:33 +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
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)
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)
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
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
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
Melanie
6535f23e4b Add saving vehicle physics data to the database 2012-07-07 02:05:01 +02:00
Melanie
26d89777d8 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-06 20:51:18 +01:00
UbitUmarov
ce7864632b added llSetVelocity. will refuse to work on vehicles and on attachments ( this last may need fix) added also some code for llSetAngularVelocity but not working still 2012-07-06 17:13:11 +01:00
UbitUmarov
c8f7cd60cd fix turning off phanton always decreasing number of physical parts 2012-06-21 19:05:36 +01:00
Melanie
eab211f94d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2012-06-21 01:10:13 +01:00
Justin Clark-Casey (justincc)
714db90832 refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() instead of attachmentpoint magic numbers. 2012-06-20 22:46:01 +01:00
Justin Clark-Casey (justincc)
e23d7ff9c0 minor: If logging because mesh/sculpt data isn't present for an object, log object UUID rather than local id, since UUID doesn't potentially vary between simulator starts. 2012-06-20 00:05:48 +01:00
UbitUmarov
5d32979170 Revert changes... 
This reverts commit c8227e1bb7.
 2012-06-15 14:31:35 +01:00
UbitUmarov
065cda3711 Add sop IsPhysical and IsPhantom to be used gradually in core in place of asking physics engines all the time. Some engines delays may make them give wrong answers. 2012-06-15 12:19:42 +01:00
Justin Clark-Casey (justincc)
a4290048e5 Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private. 
Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations.
This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs.
It appears this is no longer true with Neck and Root (Avatar Center)
 2012-06-14 01:20:55 +01:00
Melanie
36117e079a Merge branch 'master' into careminster 2012-06-14 00:57:05 +01:00
Melanie
c0b21d92c2 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-06 14:16:19 +01:00
Melanie
170b820a11 Fix land collisions to work like SL. 2012-06-05 01:53:25 +02:00
Melanie
fd176aab8f Actually trigger land collisions in the root even when a child collides 2012-06-04 22:41:29 +02:00
Melanie
e696d1d952 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-05-31 03:37:43 +01:00
Melanie
e80161753f Merge branch 'master' into careminster 2012-05-31 03:35:24 +01:00
Melanie
b660c4991b Fix collision filtering. The filter should be checked on the receiving part! 2012-05-29 18:18:47 +01:00
Melanie
10e9ad0086 Fix collision filtering 2012-05-29 16:56:04 +02:00
Melanie
78e657fd8d Merge branch 'avination' into careminster 2012-05-27 19:35:36 +01:00
UbitUmarov
32e63fc04f missing update script events call 2012-05-20 17:30:01 +01:00
UbitUmarov
2c498baf58 a bit faster collision sound type verification plus a few fixes/changes 2012-05-19 13:53:49 +01:00
UbitUmarov
9ecdef2686 modulate collision sound intensity with collision relative velocity for parts also 2012-05-19 02:04:10 +01:00
Melanie
b4cd8b491b Merge branch 'avination' into careminster 2012-05-17 13:34:47 +01:00
UbitUmarov
6af78836a5 trigger collision sounds on active agent position for better spatial effect without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code 2012-05-17 12:17:29 +01:00
UbitUmarov
b743835f9e default colisionVolume is 0, use it only for user specified sound 2012-05-17 01:36:42 +01:00
UbitUmarov
7cbc54d92a default collision sounds. Incomplete, untested, needs revision 2012-05-17 01:04:30 +01:00
UbitUmarov
0de7219485 collision sounds: simplify send code a bit and limit sending rate to 5 per sec per part ??? 2012-05-16 23:36:37 +01:00