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

3507 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
72d1d96c5c Always close script linemap file after reading and always dispose of other streams in the script engine even if exceptions are thrown. 2014-12-03 20:31:09 +00:00
Justin Clark-Casey (justincc)
432f0e8783 Correct 690fe0c to actually log the exception reported in DoOnRezScriptQueue()(and now the scene name). 2014-11-29 15:04:16 +00:00
Justin Clark-Casey (justincc)
690fe0c5e5 If there are any exceptions in XEngine.DoOnRezScriptQueue() then log the error and always set m_CurrentCompile = null 
Setting m_CurrentCompile = null in the finally block reduces the risk that an exception could permanently stop any future scripts compiling until the simulator is restarted.
If an exception is seen from this then please report and further changes to fix the bug or improve compiling reliability can be made.
 2014-11-29 01:42:52 +00:00
Justin Clark-Casey (justincc)
55e064baf7 Remove minor race condition where two threads could race on fields such as m_ScriptFailCount as set in XEngine.DoOnRezScriptQueue() 2014-11-29 01:33:14 +00:00
Justin Clark-Casey (justincc)
86367d7219 refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class. 
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
 2014-11-25 23:56:32 +00:00
Justin Clark-Casey (justincc)
3a296a817b Fix compile error from previous 1d56029848e96016b5809f596619e32d0ebcc995 2014-11-25 23:23:11 +00:00
Justin Clark-Casey (justincc)
550cf714bc Fix issue where llRemoteLoadScriptPin() would treat 0 (the default) as a valid set pin in a destination prim rather than the unset no pin state 
Adds regression test for this case.
 2014-11-25 23:23:11 +00:00
Justin Clark-Casey (justincc)
ec8d21c434 Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis. 
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
 2014-11-25 23:23:10 +00:00
Justin Clark-Casey (justincc)
336790e7b4 Add some more llGiveInventory() regression tests 2014-11-25 23:22:19 +00:00
Justin Clark-Casey (justincc)
fc878a33ed refactor: consistently put all test classes in the OpenSim.Tests.Common package rather than some in OpenSim.Tests.Common.Mock 
the separate mock package was not useful and was just another using line to always add
 2014-11-25 23:21:37 +00:00
Melanie Thielker
3a94e20d70 Merge branch 'ubitworkmaster' 2014-11-21 04:10:38 +01:00
Melanie Thielker
80118ac057 Remove braindead "fix" that messed up intersim scripted giving. 2014-11-21 04:00:52 +01:00
Cinder
cfaf904a3b LSL key should be implicitly cast to a boolean value 
Signed-off-by: James Hughes <jamesh@ascent.bluewallgroup.com>
 2014-11-20 11:32:46 -06:00
UbitUmarov
7bcb68d7c4 some steps to rez center or root of prim inventory object at requested 
position ( does nothing diferent still )
 2014-11-19 16:59:11 +00:00
UbitUmarov
07074d068b dont do recoil on llRezObject called from attachments, as seem to happen 
at sl
 2014-11-18 10:37:46 +00:00
UbitUmarov
140c0b3bb8 n llPushObject if pushed object is a avatar use its rotation, not pusher 
rotation
 2014-11-14 06:28:48 +00:00
Justin Clark-Casey
5aa8ba1b45 Fix issue where llRemoteLoadScriptPin() would treat 0 (the default) as a valid set pin in a destination prim rather than the unset no pin state 
Adds regression test for this case.
 2014-11-11 17:59:56 +00:00
UbitUmarov
382df37f80 remove some Xengine errors on scripted object delete 2014-10-22 10:21:54 +01:00
Justin Clark-Casey (justincc)
c8664e8907 Add some more llGiveInventory() regression tests 2014-10-16 19:54:40 +01:00
Justin Clark-Casey (justincc)
00b23e51ae Change name of just added OSSL osForceSit() to osForceOtherSit() 
This is somewhat more in keeping with something like osForceAttachToOtherAvatarFromInventory()
and potentially allows a separate osForceSit() command with High threat rather than VeryHigh that only sits the owner and can be enabled without enabling sit of other avatars.
 2014-10-11 00:14:35 +01:00
Justin Clark-Casey (justincc)
5acbbcb33f minor: spacing cleanup from previous commit 79a4d1ea 2014-10-11 00:10:49 +01:00
Vegaslon
79a4d1ea8d Implements osForceSit(string avatar) & overload osForceSit(string avatar, string target) 
Allows a script IN the target prim to force an avatar to sit on it using normal methods as if called by the client.

Overload method of osForceSit() to allow a script NOT in the target prim to force an avatar to sit on the target prim using normal methods as if called by the client.

This patch is based on previous work from
http://opensimulator.org/mantis/view.php?id=4492
and also includes the suggestions from justincc including change of threat level
Thank you Christos Lightling.
 2014-10-11 00:04:25 +01:00
Justin Clark-Casey (justincc)
29a05cdeb5 Change thread of osForceAttachToOvtherAvatarFromInventory to VeryHigh from Severe 
It fits much better in this category.
 2014-10-08 23:35:25 +01:00
Justin Clark-Casey (justincc)
cbd428cff3 Add LSL transaction_result event. 
This is cinderblocks' transaction_result.diff from http://opensimulator.org/mantis/view.php?id=7329 but I have used lsl.parser.cs and lsl.lexer.cs files generated directly from opensim-libs rather than those supplied in the patch.
I also added scriptEvents.transaction_reuslt.
The required parser/lexer generation file changes were made in commit d564f28 in the opensim-libs repo.
Thanks!
 2014-10-04 00:16:47 +01:00
UbitUmarov
6d2cdd31fe populate collision lists with LinkNumber, and detected structure in 
Xengine
 2014-09-23 23:59:05 +01:00
UbitUmarov
f95bb53371 remove LockItemsForRead(false) without previus call with true 2014-09-21 23:02:02 +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
UbitUmarov
f66b58cf00 *TEST* add movement states SIT and SITGROUND. ScenePresence on SIT, 
SITGROUND or STAND, sets directly the state, and desired sitAnimation for
default sits
 2014-09-10 19:30:57 +01:00
UbitUmarov
724d174a77 it its a default ( internal ) animation return its name in lower case 2014-09-09 23:36:10 +01:00
UbitUmarov
13cb6ef6ef remove the check animState == anim for same reasons 2014-09-09 23:30:31 +01:00
UbitUmarov
4842806ea8 look for animation on part inventory before default animations, so 
user can use same name. Search directly on default animations using
 uppercase.
 2014-09-09 23:22:36 +01:00
Melanie Thielker
87a4abac50 Plumb the rest of the serverside AO 2014-09-09 20:50:41 +02:00
Melanie Thielker
2d2823f1de Add some case magic and send an anim pack when an override is set 2014-09-09 20:16:02 +02:00
UbitUmarov
46abe0c86d Merge branch 'master' into ubitworkmaster 2014-09-09 13:54:00 +01:00
Melanie Thielker
347c5b3070 Add perms check 2014-09-09 05:20:53 +02:00
Melanie Thielker
5376d0a97b Also check standard anim names 2014-09-09 03:31:04 +02:00
UbitUmarov
d00aa403e0 Merge branch 'master' into ubitworkmaster 2014-09-09 02:05:44 +01:00
Melanie Thielker
e775e1a317 make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachments 2014-09-09 03:03:27 +02:00
Melanie Thielker
f2390f7c72 Plumb llSetAnimationOverride 2014-09-09 03:01:05 +02:00
UbitUmarov
8e15d4ad57 limit number of prims on physical objects. Not all cases covered still 2014-09-08 23:58:49 +01:00
Justin Clark-Casey (justincc)
d582db6132 Fix recent regression from 473c5594 where camera started to judder on moving vehicles. 
Other parts of OpenSimulator are relying on SP.Velocity == 0 for vehicles.
So add and use SP.GetWorldVelocity() instead when we need vehicle velocity, along the same lines as existing SP.GetWorldRotation()
 2014-09-02 23:39:52 +01:00
Justin Clark-Casey (justincc)
bb7c88805a As per the LL grid, for attachments make llGetObjectDetails() OBJECT_VELOCITY return the avatar's velocity and not always Vector3.Zero. 
This completes http://opensimulator.org/mantis/view.php?id=7177
 2014-08-30 00:58:47 +01:00
Justin Clark-Casey (justincc)
4d8bc007e2 minor: fix wrong indentation in previous commit 0cc3cd 2014-08-30 00:54:36 +01:00
Justin Clark-Casey (justincc)
0cc3cdfb4e As per the LL grid, for attachments make llGetObjectDetails() OBJECT_ROT return the avatar's rotation. 
This is already the behaviour of OBJECT_POS.
Partially satisfies http://opensimulator.org/mantis/view.php?id=7177
 2014-08-30 00:48:59 +01:00
Justin Clark-Casey (justincc)
099212167b Implement STATUS_BLOCK_GRAB_OBJECT in llSetStatus()/llGetStatus() and correct effect of STATUS_BLOCK_GRAB 
As per http://wiki.secondlife.com/wiki/LlSetStatus
Setting STATUS_BLOCK_GRAB_OBJECT prevents or allows move of a physical linkset by grab on any prim.
Setting STATUS_BLOCK_GRAB prevents or allows move of a physical linkset by grab on a particular prim.
Previously, setting STATUS_BLOCK_GRAB would prevent drag via all prims of the linkset.
 2014-08-29 23:40:21 +01:00
Kevin Cozens
321816b32c Prevent exception if inventory item in llGiveInventory() call doesn't exist. 2014-08-18 16:00:49 -04:00
Kevin Cozens
626536b8cc Added RestrictEmail to make llEmail only send to avatars email address if true. 2014-08-14 02:40:06 -04:00
Melanie Thielker
22d472e34a Merge branch 'ubitworkmaster' 2014-08-11 18:45:39 +02:00
UbitUmarov
67a91ee314 make sensors detect sitting avatars also by the distance to the root prim 
of the object as sl does (as sl avatar needs to be in the arc)
 2014-08-10 22:13:39 +01:00
Melanie Thielker
4707c48828 LSL llListFindList fix: check types as well as content. Items must be same type 
to be found.
 2014-08-10 22:00:01 +02:00