Freaky Tech
7f0995ae31
added llGetEnv() implementation
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:39:00 -05:00
Freaky Tech
b519a5e62a
corrected osMakeNotecard(string data) text length was calculated wrong. The Linden text format defines a byte count in that format.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:10:09 -05:00
Freaky Tech
0f72773017
changed llGetMemoryLimit to return 65536 as for Mono LSL
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:09:49 -05:00
Freaky Tech
af2bf397b1
corrected memory info for scripts
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 16:09:41 -05:00
Magnuz Binder
158c3f82f1
Correct PRIM_TEXT return value from trans to alpha.
2015-02-28 00:46:12 +00:00
BlueWall
aeb8a4bf85
Revert "Adding dynamic ossl permission control"
...
This reverts commit a3681f3052
until
further testing. Jenkins now fails ossl tests.
2015-02-27 12:27:10 -05:00
BlueWall
a3681f3052
Adding dynamic ossl permission control
...
Add permission by identifying uuid (owner/creator/group) and function. Revoke
permission in the same manner. Permission adjustments immediately effect
running scripts ability to call os functions.
osGrantScriptPermissions(UUID key,string function) Threat Level Severe
osRevokeScriptPermissions(UUID key,string function) Threat Level Severe
work sponsored by: Rage
2015-02-27 11:05:15 -05:00
dahlia
8333dcf388
llLookAt(): use non-physical rotation if host prim is a physical attachment
2015-02-24 17:16:30 -08:00
dahlia
39754b2dca
correct some minor comment misspellings in last commit
2015-02-02 04:03:04 -08:00
dahlia
1eedc2b4af
Compute rotation for llLookAt() with local positive X axis pointing down
2015-02-02 02:47:47 -08: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)
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
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
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 (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
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
UbitUmarov
c3b5a6c2ab
change how sounds work. May be bad.. needs testing
2014-07-27 08:18:27 +01:00
Melanie Thielker
34c40a1e1a
Remove some already commented lines
2014-07-20 23:58:16 +02:00
Melanie Thielker
c37a88d4f1
Fix LSL portions of sit positioning
2014-07-20 23:54:06 +02:00
UbitUmarov
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
Justin Clark-Casey (justincc)
0c8f3dddd8
Use thread-safe version of .NET Random as the SDK class is not thread-safe.
...
As per http://msdn.microsoft.com/en-us/library/system.random%28v=vs.100%29.aspx , the .NET Random class is not thread-safe.
If called by multiple threads at once, methods may return 0.
Except for llRand(), other OpenSimulator code did not lock before calling a shared Random instance.
This commit adds a ThreadSafeRandom class that extends Random but does internal locking so that it is thread-safe.
This change is invisible to existing callers and the explicit locking in the llFrand() implementation is now redundant.
2014-07-14 20:08:11 +01:00
Melanie Thielker
159fcbf150
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
Justin Clark-Casey (justincc)
5450b1b024
Change assembly versions to 0.8.1
2014-06-17 18:37:15 +01:00
Diva Canto
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
Justin Clark-Casey (justincc)
174df94172
If a script calls llSetCameraAtOffset() or llSetCameraEyeOffset() on a child prim and the root prim has no corresponding value set, then also set the root prim.
...
This matches behaviour just tested on the Linden Lab grid.
2014-05-22 23:58:28 +01:00
Vegaslon
e245638f24
Change llUnSit to be able to unsit any avatar that is currently sat on the object, not just avatars sitting on the sittarget in the object containing the script. or when the object is owned by the parcel, land group or estate owner.
2014-05-06 17:35:34 +01:00
Talun
c9742c826d
Mantis 7146 The lsl function llGetMassMKS is not implemented
...
This patch implements llGetMassMKS as it is described in the wiki
http://wiki.secondlife.com/wiki/LlGetMassMKS
2014-05-06 17:31:21 +01:00
Oren Hurvitz
eb79c882ea
Show more meaningful error messages when failed to move an item from a prim to a user's inventory.
...
Also, actually show the error to the user in more cases. (Previously, sometimes the operation failed without telling the user anything.)
2014-05-06 07:28:45 +01:00
Oren Hurvitz
7862d1e20d
Added range-checking for the parameters to PRIM_POINT_LIGHT (used in llSetLinkPrimitiveParamsFast() )
2014-05-06 07:14:58 +01:00
Melanie
f0eeb47262
Add the "StateChange" function to the async comand manager to differentiate
...
between state changes and script exit/reset.
2014-04-30 20:54:34 +01:00
Melanie Thielker
d97896d39a
Differentiate between requests only the owner should be able to do and those
...
that managers can do when setting parcel data
2014-04-26 20:32:27 +02:00
Oren Hurvitz
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
Justin Clark-Casey (justincc)
7c148d9b2f
minor: use constants instead of magic numbers in llRequestAgentData() where possible
2014-04-11 00:52:28 +01:00
Justin Clark-Casey (justincc)
530c86335d
Fix the presence info caching used in llRequestAgentData(), which was completely inoperative.
...
This means the presence info may be out of date by up to 20 seconds, but this avoids scripts potentially triggering constants requests to user accout and presence info services.
Relates to http://opensimulator.org/mantis/view.php?id=7088 though I fixed in a different way.
Adds regression test for this case.
2014-04-11 00:29:06 +01:00
Justin Clark-Casey (justincc)
6ac9c9c972
refactor: Use m_sittingAvatars to maintain the list of sitting avatars instead of two independent structures that do exactly the same thing
...
m_sittingAvatars code also already properly handles locking to avoid races.
2014-04-03 01:14:39 +01:00
BlueWall
59d0e3c3c8
Add check to prevent the return of a wrong value when key is NULL_KEY
2014-03-31 15:49:53 -04:00
Talun
fb312279c9
Mantis 6922: No particles are generated if their size exceeds the maximum allowed size.
...
This patch ensures that no particle scal value can exceed 4.0
2014-03-21 23:13:34 +00:00
Talun
bd6f734d3a
Mantis 6974 PERMISSION_TRACK_CAMERA should be implicit on attach.
...
http://wiki.secondlife.com/wiki/Run_time_permissions
This change makes PERMISSION_TRACK_CAMERA implicit on attach
2014-03-20 20:11:26 +00:00
Justin Clark-Casey (justincc)
873eee5431
Implement osForceBreakAllLinks().
...
Identical to llBreakAllLinks() except that it doesn't require the script to have link permissions.
2014-03-13 00:04:20 +00:00
Justin Clark-Casey (justincc)
6a279feb2f
Only allow llBreakAllLinks() to work if script has received PERMISSION_CHANGE_LINKS
...
As per http://wiki.secondlife.com/wiki/LlBreakAllLinks
Same as existing llCreateLink() and llBreakLink()
2014-03-12 23:54:20 +00:00
Justin Clark-Casey (justincc)
296d63e20b
Implement osForceCreateLink() and osForceBreakLink()
...
These are identical to llCreateLink() and llBreakLink() except that they don't require script permissions.
However, osForceCreateLink() still requires that linked and linkee still have the same owner.
There's also an AutomaticLinkPermission setting in [XEngine] that could be set to true to prevent the LSL function checks.
But this doesn't allow the finer control over which users/scripts, etc. can do this that the OSSL functions provide.
2014-03-12 23:05:16 +00:00
Dev Random
9de3fe9410
Add Varregion support to osGetRegionSize OSSL function
...
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2014-03-07 17:48:07 -05:00
Justin Clark-Casey (justincc)
31de7b845f
When positioning agent with PRIM_ROTATION in llSetLinkPrimitiveParams(), set the global rotation rather than the local rotation
...
Functionally the same as the patch in http://opensimulator.org/mantis/view.php?id=7044 , thanks Aleric.
This commit also extends the regression test
2014-03-03 23:35:21 +00:00
Justin Clark-Casey (justincc)
91333b9267
Stop LSL_Api.GetLinkEntities() from creating an unused list on every parameter except LINK_THIS. Simplify code.
2014-02-27 00:23:24 +00:00
Justin Clark-Casey (justincc)
ed760f2586
minor: remove unused variable from recent commit 0e23374
2014-02-27 00:14:16 +00:00
Justin Clark-Casey (justincc)
d7c9725ec0
refactor: Make osGetPrimtiveParams() and soSetPrimitiveParams() use common get/set params code in LSL_Api rather than an old copy&pasted section.
2014-02-27 00:11:50 +00:00
Justin Clark-Casey (justincc)
0e23374aa2
Implement PRIM_ROTATION, PRIM_ROT_LOCAL, PRIM_POSITION and PRIM_POS_LOCAL when manipulating avatars via llSetLinkPrimitiveParams()
...
Combination of core parts of Freaky's patch at https://github.com/ft-/opensim-patches/blob/master/opensim-llsetlinkprimitive-agent-fix.patch plus further adjustments from myself.
Resolves Mantises 6121, 6421, 6573, 6657
2014-02-26 23:07:13 +00:00
Justin Clark-Casey (justincc)
b2878eb773
Merge branch 'justincc-master'
2014-01-31 00:51:22 +00:00
David Rowe
1380b37d71
Made error messages more consistent
2014-01-31 00:24:52 +00:00
David Rowe
3d62f4369d
Replaced throwing exceptions with calls to Error()
2014-01-31 00:24:47 +00:00
David Rowe
d405254971
Replaced llSay()ing LSL errors with calls Error()
2014-01-31 00:24:43 +00:00
David Rowe
9db4090c07
Replaced LSLError() calls with calls to Error()
2014-01-31 00:24:40 +00:00
David Rowe
c9550e473d
Updated "deprecated" LSL errors to use Deprecrated()
2014-01-31 00:24:36 +00:00
David Rowe
257f9cec40
Updated "not implemented" LSL errors to use NotImplemented()
2014-01-31 00:24:31 +00:00
David Rowe
13bb9ea682
Updated ShoutError() calls to use new LSL error methods
2014-01-31 00:21:22 +00:00
David Rowe
67ec95bde8
Updated methods for handling LSL script errors, deprecated, and not implemented
2014-01-31 00:20:10 +00:00
Melanie
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
Melanie
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
Robert Adams
8eec717f5f
Merge branch 'master' into varregion
2014-01-28 08:50:28 -08:00
Oren Hurvitz
2cf224166f
Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions
2014-01-28 00:11:50 +00:00
Robert Adams
f127e4b4ee
Merge branch 'master' into varregion
2014-01-19 07:38:53 -08:00
Justin Clark-Casey (justincc)
e9454d4672
Following on from 50ea2e0
, only fetch scene presence for check if lightscript function has failed initial IsEstateManagerOrOwner() check
2014-01-18 01:36:40 +00:00
Oren Hurvitz
50ea2e0d67
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-18 01:26:30 +00:00
Justin Clark-Casey (justincc)
14c72d4a5b
Revert "Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene"
...
This reverts commit 39e5785c0f
.
Did not mean to apply this yet.
2014-01-17 01:58:10 +00:00
Oren Hurvitz
39e5785c0f
Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene
2014-01-17 01:47:37 +00:00
Robert Adams
1cf17a3cf7
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
2014-01-11 08:52:23 -08:00
David Rowe
08f2fc63cd
Fixed llTextBox error message text
2014-01-10 20:43:24 +00:00
Robert Adams
2d2bea4aa7
varregion: many more updates removing the constant RegionSize and replacing
...
with a passed region size. This time in the map code and grid services code.
2013-12-26 22:45:59 -08:00
Robert Adams
13a9a4b653
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
...
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
2013-12-14 07:53:01 -08:00
Melanie
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
Robert Adams
604b39cea9
Merge branch 'master' into varregion
2013-11-15 14:56:13 -08:00
Justin Clark-Casey (justincc)
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
Robert Adams
beeec1c467
varregion: elimination of Constants.RegionSize from all over OpenSimulator.
...
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
2013-11-08 20:53:37 -08:00
Melanie
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
Robert Adams
f7bd0da026
Merge branch 'master' into varregion
2013-11-06 06:32:11 -08:00
dahlia
0b4577d5b0
add support for particle glow LSL functions
2013-11-05 23:48:44 -08:00
dahlia
709814c194
add support for particle blending LSL functions
2013-11-05 23:38:43 -08:00
Robert Adams
c931b16c1f
Merge branch 'master' into varregion
2013-11-04 22:12:57 -08:00
Melanie
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
dahlia
cc73ef4eb9
add new particle system blending rule enumerations
2013-10-31 17:49:01 -07:00
Robert Adams
2be0347f50
Merge branch 'master' into varregion
2013-10-28 09:30:26 -07:00
Kevin Cozens
84a149ecbf
Call ScriptSleep() instead of llSleep() in routine for llEmail.
...
Signed-off-by: teravus <teravus@gmail.com>
2013-10-18 14:30:05 -05:00
Robert Adams
8937a2244d
Merge branch 'master' into varregion
2013-10-16 07:53:44 -07:00
Oren Hurvitz
d0c1780839
Fixed rezzing coalesced objects from a prim's inventory
...
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
2013-10-15 23:59:16 +01:00
Robert Adams
86bf79aa2b
Merge branch 'master' into varregion
2013-10-07 13:58:17 -07:00
Robert Adams
25ae59b9eb
varregion: remove scattered use of Constants.RegionSize by having routines reference RegionInfo.RegionWorldLoc?.
2013-10-07 13:57:30 -07:00
Melanie
69054ad134
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc)
42bdf44658
Bump OPenSimulator version and assembly versions up to 0.8.0 Dev
2013-10-04 23:33:47 +01:00
Melanie
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
Robert Adams
317c04fe17
VarRegion: change RegionInfo storage of region coordinates from region
...
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
2013-09-28 07:33:52 -07:00
Justin Clark-Casey (justincc)
b16bc7b01c
refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly.
...
Adds IScene.CloseAgent() to replace RemoveClient()
2013-09-27 19:14:21 +01:00
Justin Clark-Casey (justincc)
f99dae03cb
Fix bug where using PRIM_LINK_TARGET with only two remaining list items (e.g. link number then PRIM_ROTATION) would not return the parameter
...
Extended regression test for this case
2013-09-16 23:00:40 +01:00
Justin Clark-Casey (justincc)
60cf42cb8d
Make llGetLinkPrimitiveParams() abort and return existing list of params when it encounters an invalid link number, rather than throwing an exception
...
Addresses http://opensimulator.org/mantis/view.php?id=6768
Thanks to talun for the patch on that commit - in the end I took a different approach that also deals with invalid PRIM_LINK_TARGET
However, not yet generating the same warning on invalid PRIM_LINK_TARGET as seen on LL grid
This commit also adds regression tests for some cases of llGetLinkPrimitiveParams()
2013-09-16 22:56:08 +01:00
Talun
07d6a0385f
6762: llList2Key fails to convert a string in a list to a key
...
llGetPrimitiveParams changed to return the sculpty key as an LSL_String so
that type checking in llList2Key will work
2013-09-12 23:23:52 +01:00
Melanie
005c69511d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
Robert Adams
87ee0c395e
Fix problem with modInvoke defined integer constants being build into
...
scripts as boxed integers rather than proper reference to a new LSLInteger.
This fixes an exception when using a registered integer constant in
a script.
2013-08-02 09:44:01 -07:00
Melanie
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
Justin Clark-Casey (justincc)
cec8e6d0f7
If a sensor is in an attachment, avoid throwing an exception if the attachee is removed from the scene before we try to retrieve them.
2013-07-09 23:52:47 +01:00
Robert Adams
d838f15d97
Add implementations for llSetVelocity and llSetAngularVelocity.
2013-07-06 09:53:30 -07:00
Melanie
24a4367fc2
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2013-06-23 01:48:57 +01:00
Melanie
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
dahlia
694c4bcbb6
correct method doc for llRot2Axis()
2013-06-14 20:00:20 -07:00
Justin Clark-Casey (justincc)
da3724a904
minor: remove mono compiler warnings from LSL_Api, properly format method doc for llRot2Axis()
2013-06-15 00:11:36 +01:00
Talun
f074739e33
Mantis 6280: llSetContentType(). An implementation.
...
An implimentation of llSetContentType including all of the new
constants added since the mantis was raised.
2013-06-15 00:06:03 +01:00
Talun
fc89bde044
Mantis 6108: ossetprimitiveparams temporary/phantom problem
...
Corrected to ensure that the target prim is updated by
osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM
instead of the prim that the script is in.
2013-06-15 00:00:00 +01:00
Melanie
0be80e5813
Forward the reason to the script
2013-06-13 02:52:51 +02:00
Melanie
62c277ff9f
Add a result param to te money module interface
2013-06-13 02:52:11 +02:00
Melanie
400f876d98
Merge branch 'master' into careminster
2013-06-11 21:01:58 +01:00
dahlia
ed950e6c74
Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Addresses Mantis #0006671
2013-06-11 00:29:40 -07:00
dahlia
9d9b9d4938
llRot2Angle now checks absolute value of s rotation component before normalizing
2013-06-10 17:11:49 -07:00
dahlia
b242ead6df
llRot2Axis now checks absolute value of s rotation component before normalizing. Also removed some excessive division and cleaned up a bit
2013-06-10 17:10:04 -07:00
Melanie
6b55be6e2f
Merge branch 'master' into careminster
2013-06-11 01:04:50 +01:00
Melanie
a022ee5766
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-06-11 01:03:15 +01:00
teravus
1c7fbb86c2
Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669
2013-06-10 18:47:08 -05:00
Talun
7de0912a97
Mantis 5346: llAxisAngle2Rot() should normalize before computing
...
Corrected to agree with
http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes
to normalise the vector before computing the quaternion
Signed-off-by: dahlia <dahlia@nomail>
2013-06-10 04:13:34 -07:00
Melanie
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
Melanie
81ad9255b5
Hook up Keyframe motion to almost everything. Failing to cross a sim border
...
may yield unexpected results in some cases. No database persistence yet,
2013-06-06 03:03:05 +01:00
Melanie
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
Melanie
57c8d82c9e
Fix llTeleportAgentGlobalCoords
2013-06-02 23:53:20 +02:00
Melanie
bd87eb90d1
Implement PERMISSION_TELEPORT and the needed checks to make it work.
...
Old auth system still works as well.
2013-06-02 16:28:28 +02:00
Justin Clark-Casey (justincc)
217c7d1140
Remove unnecessary m_scenes and m_scene from AsyncCommandManager.
...
These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
2013-05-31 23:00:10 +01:00
Justin Clark-Casey (justincc)
921ad8704e
Lock areas of AsyncCommandManager where multiple threads could try to access/update the same static structures simultaneously.
...
This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used.
These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651
This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
2013-05-31 22:50:15 +01:00
Justin Clark-Casey (justincc)
00c1586ff8
refactor: Remove unused AsyncCommandManager.PleaseShutdown
2013-05-31 18:12:36 +01:00
Justin Clark-Casey (justincc)
46335b103e
If an exception occurs in the AsyncCommandManager loop, spit it out to log rather than silently swallowing it.
...
This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
2013-05-30 23:51:35 +01:00
Melanie
a348c8e44a
Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
2013-05-26 14:11:48 +02:00
Melanie
09c2cd0d76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-05-24 00:45:08 +01:00
Justin Clark-Casey (justincc)
7d38f4940c
Implement llSetSoundQueueing().
...
This is controlled by the viewer, not the server.
So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing , only two sounds can be queued per prim.
You probably need to use llPreloadSound() for best results
2013-05-22 20:01:57 +01:00
Melanie
a8faed6f76
Implement llSetContentType using the new OpenID auth support for authentication
2013-05-05 22:01:07 +02:00
Melanie
4904d40138
Add llGetPhysicsMaterial
2013-05-04 00:44:47 +02:00
Justin Clark-Casey (justincc)
831e4c3850
Fix bug where outstanding llHTTPRequests for scripts were not being aborted when they were deleted.
...
This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
2013-04-04 00:36:15 +01:00
Kevin Cozens
cbc9ae898c
Added missing functionality (mainly custom headers) to llHTTPRequest.
2013-03-29 23:32:11 +00:00
Melanie
d5d6a274a7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-29 23:28:47 +00:00
Justin Clark-Casey (justincc)
13170ca627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 20:32:22 +00:00
Justin Clark-Casey (justincc)
3f0f313a76
Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars in a linkset.
...
llGetPrimitiveParams() works through PRIM_LINK_TARGET
Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
2013-03-26 20:25:58 +00:00
Melanie
5f4c4df227
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-26 03:40:06 +00:00
Melanie
c341664c1b
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-24 18:56:28 +01:00
Melanie
5e1f651e21
Merge branch 'master' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:31:27 +00:00
Melanie
fcecfc81bb
Multiattach, part 1
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-18 22:56:03 +00:00
Melanie
7e5d553781
Make the LSL memory functions virtual so script engines can override them if they have different memory management.
2013-03-15 23:46:49 +00:00
Melanie
b9146a7922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-15 23:45:32 +00:00
Justin Clark-Casey (justincc)
e25ba116a3
refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity() method
2013-03-15 00:06:42 +00:00
Justin Clark-Casey (justincc)
081271e1d7
minor: remove mono compiler warnings in LSL_Api.cs
2013-03-14 23:44:16 +00:00
Justin Clark-Casey (justincc)
2fbc08d7dd
refactor: minor cleanup in osGetAvatarList()
2013-03-14 23:19:18 +00:00
Justin Clark-Casey (justincc)
0ea0f8aa83
Fix bug in osCauseHealing() if called with an avatar ID for an avatar that is not in the scene.
2013-03-14 23:16:39 +00:00
Justin Clark-Casey (justincc)
56b333f301
minor: Use more compact libomv primitive constructors in osNpcGetPos() and osNpcGetRot()
2013-03-14 23:12:58 +00:00
Justin Clark-Casey (justincc)
55204ccde6
Fix minor race conditions in OSSL_Api functions where a parcel could be misidentified for moving prims.
2013-03-14 23:09:59 +00:00
Justin Clark-Casey (justincc)
f8dab4f93f
refactor: Use LSL_Vector(Vector3) constructor in llCastRay()
2013-03-14 23:06:54 +00:00
Justin Clark-Casey (justincc)
ca99f418d8
refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than having to continually take intermediate Vector3s to avoid race conditions
2013-03-14 23:05:21 +00:00
Justin Clark-Casey (justincc)
c09f4ff483
Fix minor race condition in llGetCameraRot() where inconsistent information could be returned for a rotating camera
2013-03-14 22:49:08 +00:00
Justin Clark-Casey (justincc)
114fd042de
Fix minor race condition in llGetCameraPos() where an inconsistent post could be returned for a moving camera
2013-03-14 22:46:27 +00:00
Justin Clark-Casey (justincc)
d4b109b4c4
Fix minor race condition in llParcelMediaCommandList() where a parcel could be misidentified for a moving prim
2013-03-14 22:45:00 +00:00
Justin Clark-Casey (justincc)
2a81eb8d45
Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, PRIM_SIZE and PRIM_ROT_LOCAL
...
This function is used by all the various ll*Params() and os*Params() functions
2013-03-14 22:42:11 +00:00
Justin Clark-Casey (justincc)
b23009e480
Fix minor race condition in llGetGeometricCenter() if this was changing whilst the function was called.
2013-03-14 22:35:41 +00:00
Justin Clark-Casey (justincc)
a6f8638174
refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation()
2013-03-14 22:34:48 +00:00
Melanie
8b657773e4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2013-03-14 22:34:15 +00:00
Justin Clark-Casey (justincc)
dd6f1fc637
Fix minor race condition in llGetRootPosition() where inconsistent results could be returned for moving prims
2013-03-14 22:33:44 +00:00
Justin Clark-Casey (justincc)
e7603f98b7
Fix minor race conditions in detecting current parcel for llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims
2013-03-14 22:31:07 +00:00
Justin Clark-Casey (justincc)
e6eb914675
refactor: use LSL_Vector(Vector3) constructor in llGroundNormal()
2013-03-14 22:29:09 +00:00
Justin Clark-Casey (justincc)
f8c24b2a61
minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new one.
2013-03-14 22:26:37 +00:00
Justin Clark-Casey (justincc)
3c9bea1e3f
Fix minor race conditions in llTeleportAgent(), llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars.
2013-03-14 22:22:10 +00:00
Justin Clark-Casey (justincc)
7b85279dba
refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass()
2013-03-14 22:14:32 +00:00
Justin Clark-Casey (justincc)
ff6a16b46e
Fix a minor race condition in llInstantMessage() where slightly wrong origin co-ordinates could be given for a fast moving prim
2013-03-14 22:09:05 +00:00
Justin Clark-Casey (justincc)
895aa7346f
Fix minor race condition in llGetOmega() where inconsistent results could be returned (accidentally stated that commit 1774c631
was this fix).
...
Commit 1774c631
was actually a fix for a similar minor race condition in llGetAccel()
2013-03-14 22:07:07 +00:00
Justin Clark-Casey (justincc)
1774c631cb
Fix minor race condition in llGetOmega() where a call whilst a prim was changing angular velocity could return inconsistent results
2013-03-14 22:04:11 +00:00
Justin Clark-Casey (justincc)
04e806036f
refactor: Use LSL_Vector(Vector3) constructor in llGetVel()
2013-03-14 22:02:43 +00:00
Justin Clark-Casey (justincc)
ffbbe29229
refactor: Use LSL_Vector(Vector3) constructor in llGetTorque()
2013-03-14 22:01:24 +00:00
Justin Clark-Casey (justincc)
c3e081a5ca
Fix minor race condition in llGetLocalRot() where inconsistent results could be returned if the prim was rotating during the call
2013-03-14 22:00:04 +00:00
Justin Clark-Casey (justincc)
f840728273
refactor: use cleaner LSL_Rotation quaternion constructor in LSL_Api.GetPartRot()
2013-03-14 21:57:43 +00:00
Justin Clark-Casey (justincc)
ad9bd3fe93
Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use the world rotation if the avatar to which they are attached is sitting
2013-03-14 21:46:29 +00:00
Justin Clark-Casey (justincc)
e9c394fb4e
Make llGetObjectDetails() return the correct world rotation for a sitting avatar
...
This addresses http://opensimulator.org/mantis/view.php?id=6567
This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation()
SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting.
2013-03-14 21:23:48 +00:00
Melanie
70f0587558
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-08 01:07:05 +00:00
Mic Bowman
30e06b0742
Convert doubles passed back through the MOD interface into LSL_Floats
2013-03-05 20:32:06 -08:00
Justin Clark-Casey (justincc)
a9f380d124
Fix bug in osGetPrimitiveParams() so that it works for prims with the same owner as the script and not ones with different owners.
...
Addresses http://opensimulator.org/mantis/view.php?id=6560
2013-03-06 00:22:58 +00:00
Melanie
339d8ef2a6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-06 00:15:54 +00:00
Melanie
797bfbfcfa
Multiattach, part 1
2013-03-05 12:02:22 +01:00
root
82ac1763fb
Add support for void return type
2013-03-03 22:50:20 +01:00
Melanie
f39e4abf0e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
2013-03-03 13:24:37 +00:00
Melanie
eb9458fd7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
Justin Clark-Casey (justincc)
239a8da74e
Fix potential concurrency issue since the LSL notecard cache was not being checked for expiry under lock
2013-02-28 21:19:23 +00:00
Justin Clark-Casey (justincc)
a523ed1e4d
Fix bug where simultaneous calls by different scripts to llGetNotecardLine() or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event.
...
This was because the notecard asset ID was being used as the request identifier.
Now using a random ID, in common with other code using the DataServer
2013-02-28 21:15:14 +00:00
Diva Canto
3cc3a8e5bf
Removed duplicate 'using' statement.
2013-02-27 21:12:27 -08:00
Diva Canto
bb44758179
Switched to using the other Util function with a default value.
2013-02-27 20:59:16 -08:00
Diva Canto
64b8ce73da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-27 20:50:03 -08:00
Diva Canto
f1010d7b15
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
2013-02-27 20:49:41 -08:00
Melanie
578174d21c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc)
b8a7c8b26f
Add regression test for llRequestUrl()
2013-02-26 23:36:36 +00:00
root
d7c742a5f9
Remove osParseJSONNew because it's "object" return type is not useful for LSL
2013-02-25 23:01:03 +01:00
Melanie
e3ea2c4bee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-02-23 20:37:09 +00:00
Diva Canto
0e8289cd00
Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup]
2013-02-22 15:57:33 -08:00
Melanie
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Diva Canto
e515cdddec
Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
2013-02-21 17:26:19 -08:00
Diva Canto
4779f7d7d5
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
Melanie
9d55a2298d
Merge branch 'master' into careminster
2013-02-14 07:45:23 +00:00
Justin Clark-Casey (justincc)
69d0e168fb
Fix a very unlikely-to-occur NullReferenceException race condition in llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it
2013-02-14 00:20:23 +00:00
Melanie
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
Melanie
bbda7b94b3
Rename Bounciness to Restitution
2013-02-07 21:25:55 +00:00
Melanie
6aa876a83b
Rename Bounciness to Restitution
2013-02-07 03:40:48 +00:00
Melanie
6504e3d4ce
Rename "Bounciness" to "Restitution"
2013-02-07 03:30:02 +00:00
Melanie
e5beb480ea
Partial port of Avination's support for the new physics parameters.
...
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
2013-02-06 08:03:04 +00:00
Melanie
f567ff9f51
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-02-06 02:22:12 +00:00
Justin Clark-Casey (justincc)
5c94346bd7
refactor: Move functions that lookup asset ids from task inventory or pass them through to ScriptUtils class in OpenSim.Region.Framework.dll
...
Renames functions to better reflect what they do.
This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
2013-02-06 01:17:19 +00:00
Melanie
d3892bbd06
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
Melanie
128910a681
Make scripts shout a error but not stop when button count is overrun on llDialog
2013-02-05 05:40:51 +01:00
Justin Clark-Casey (justincc)
562067eb16
Fix bug where viewers would not see the "Module command functions not enabled" error if these were disabled and a viewer attempted to call one.
...
This was not working because the shouter was wrongly signalled as an agent rather than a prim
2013-02-05 02:09:21 +00:00
Justin Clark-Casey (justincc)
1f1da23097
Bump version and assembly version numbers from 0.7.5 to 0.7.6
...
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
2013-02-05 00:23:17 +00:00
Melanie
7482ad1c22
Merge branch 'master' into careminster
2013-02-04 19:21:39 +00:00
Justin Clark-Casey (justincc)
2ff301ca11
Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom
2013-02-02 01:34:49 +00:00
Melanie
8f949513fd
Merge branch 'master' into careminster
2013-01-26 16:58:02 +00:00
Talun
ceabb1b49a
Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParams
...
Correction so that scripts can turn Flexi off as well as on.
2013-01-26 02:55:24 +00:00
Melanie
0b8bf69470
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-01-25 00:10:32 +00:00
Melanie
c6e6614a44
Merge branch 'avination' into careminster
2013-01-24 23:25:38 +00:00
Melanie
789e9901dd
Make llGiveMoney async again. The return value is now the constant 1 to make
...
scripts work properly. Scripts will no longer receive a failure indication through
this return value;
2013-01-24 21:32:25 +01:00
Melanie
e785242c49
Reintroduce the return value of llGiveMoney. The grid will crash and burn without it.
2013-01-24 18:23:39 +01:00
teravus
878df52515
* This makes the non-physics llCastRay 'better'. It's not 'correctly working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
2013-01-23 21:58:51 -05:00
Melanie
be4c8c4931
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-24 00:25:08 +00:00
Justin Clark-Casey (justincc)
55c6753b13
Merge branch 'master' into cooptermination
2013-01-24 00:03:44 +00:00
Justin Clark-Casey (justincc)
8a22ac3f94
Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs.
...
APIs don't need to reference any methods on EventWaitHandle
2013-01-23 23:38:08 +00:00
Melanie
c1795ed399
Add the Avination physics raycast glue so Core Physics can implement raycast
2013-01-23 21:03:24 +00:00
Melanie
dd6ddcc7a5
Prevent double ground collisions and prefer the physics result if there is one.
...
ODE is known to not see the ground sometimes on raycast so the double test is
needed.
2013-01-23 20:58:47 +01:00
Melanie
6a2b673fca
Remove the return value from llGiveMoney and add llTransferLindenDollars. Also
...
make llGiveMoney async so the script thread is not held up waiting for comms
to an external server.
2013-01-23 19:45:36 +00:00
Melanie
fc1c77b42d
Merge branch 'avination' into careminster
2013-01-23 19:31:27 +00:00
Melanie
c75508ec8d
Fix a type (Suports => Supports). Also put the normal terrain collision check
...
into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
2013-01-23 20:29:05 +01:00
Melanie
47f18caa22
Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and
...
make the function async so the script thread is not held up waiting for comms
to an external server.
2013-01-23 18:58:29 +01:00
Melanie
f667428283
Guard against XMLRPC module ref being null, which will happen if it's disabled
2013-01-23 16:11:37 +01:00
teravus
6007eae00f
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
2013-01-21 21:34:49 -05:00
Robert Adams
95c53ecae7
Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenter
...
routines on the physics engine. Won't make a difference for any
existing scripts since ODE always returned Vector3.Zero.
2013-01-21 15:55:54 -08:00
teravus
09a3e134e4
* Fix notecard loading - If the notecard name is formatted like a UUID but isn't an actual asset UUID, then try to load it like an asset id first, then try to load it as a task inventoryitem name. If the passed UUID is a string, try to load it like a task inventory item name.
2013-01-21 17:30:38 -05:00
Melanie
903cc71f0d
Remove an extra ScriptSleep (merge artefact) from llSetLinkPrimitiveParamsFast
2013-01-19 22:53:51 +01:00
Melanie
2d3a57a002
Merge branch 'avination'
...
Conflicts:
OpenSim/Framework/ThrottleOutPacketType.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
2013-01-19 21:49:33 +01:00
Melanie
12efac494a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
2013-01-19 02:38:04 +00:00
Talun
27e2ec177a
New constants for llGetObjectDetails
...
New constants for llGetObjectDetails OBJECT_CHARACTER_TIME,
OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE,
OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ
also Pathfining constants, 3 of which are used by llGetObjectDetails
2013-01-19 01:50:16 +00:00
Talun
4f70e423df
Mantis 6507 keys returned by llGetAgentList incorrect for llList2Key
...
The type of the keys returned by llGetAgentList corrected to LSL_Key
2013-01-19 01:14:11 +00:00
Justin Clark-Casey (justincc)
74256c0cc4
Restore previous client AO behaviour by not allowing them to remove the default animation but continue to allow scripts to do so.
...
This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327
and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483
Animations may still exhibit different behaviour if both scripts and clients are adjusting animations.
A change in the behaviour of client AO to not remove all animations may be a better long term approach.
2013-01-18 22:57:09 +00:00
Justin Clark-Casey (justincc)
c8afc8523b
Implement non-wait co-operative termination of scripts for XEngine in addition to termination on wait.
...
This involves inserting opensim_reserved_CheckForCoopTermination() calls in lsl -> c# translation at any place where the script could be in a loop with no wait calls.
These places are for, while, do-while, label, user function call and manual event function call.
Call goes through to an XEngineScriptBase which extends ScriptBase.
IEngine is extended to supply necessary engine-specific parent class references and constructor parameters to Compiler.
Unfortunately, since XEngineScriptBase has to be passed WaitHandle in its constructor, older compiled scripts will fail to load with an error on the OpenSim console.
Such scripts will need to be recompiled, either by removing all *.dll files from the bin/ScriptEngines/<region-id> or by setting DeleteScriptsOnStartup = true in [XEngine] for one run.
Automatic recompilation may be implemented in a later commit.
This feature should not yet be used, default remains termination with Thread.Abort() which will work as normal once scripts are recompiled.
2013-01-17 23:39:09 +00:00
UbitUmarov
30d5faa7fc
same for SetPrimParams
2013-01-16 20:55:16 +00:00
UbitUmarov
2464e65c8a
llSetPos on child prim, send only a part terse update and not a group one
2013-01-16 20:27:10 +00:00
Melanie
9910c5f8e1
Merge branch 'avination' into careminster
2013-01-16 15:50:34 +00:00
Melanie
818254916c
JustinCC's core re-merge
2013-01-16 15:47:55 +00:00
Justin Clark-Casey (justincc)
0963ece25b
Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)
...
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
This commit, unlike 1b5c41c
, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
2013-01-16 02:07:43 +00:00
Justin Clark-Casey (justincc)
b8949024bc
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
...
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api.
This reverts commit 1b5c41c14a
.
2013-01-16 01:45:09 +00:00
Melanie
fc5711fa7a
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-01-16 01:11:20 +00:00
Justin Clark-Casey (justincc)
1b5c41c14a
Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)
...
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
2013-01-16 00:12:40 +00:00
Melanie
b3939a431c
Fix llSetRegionPos and detail behaviors of llSet[Link]PrimitiveParams[Fast]()
...
regarding prim positioning.
2013-01-15 22:15:06 +01:00
Justin Clark-Casey (justincc)
fccb03227e
Instead of passing separate engine, part and item components to script APIs, pass down IScriptInstance instead.
...
This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests.
This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method
in order to facilititate continued script logic regression testing.
2013-01-15 21:13:22 +00:00
Melanie
b924e333b7
Merge branch 'avination' into careminster
2013-01-13 13:44:28 +00:00
Robert Adams
eacc2561d1
BulletSim: add osGetPhysicsEngineType() LSL function and update
...
the physics engines to return the name that is specified in the INI
file ("physics = XXX") as the type of engine.
This os function is a little different than the others in that it
does not throw an exception of one is not privilaged to use it.
It merely returns an empty string.
2013-01-11 16:47:35 -08:00
UbitUmarov
fcf3960168
make sure keyframe rotations are normalized
2013-01-11 20:25:12 +00:00
Melanie
3a495ccd56
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-10 01:38:03 +00:00
Melanie
aecb32b74e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-01-10 01:25:07 +00:00
Justin Clark-Casey (justincc)
b1b4687250
Add "show script timers" command to show script timers. For debug purposes.
...
Also, "show sensors" changes to "show script sensors".
2013-01-10 00:57:49 +00:00
Justin Clark-Casey (justincc)
a0000a034f
Add "show sensors" command to show script sensor information for debug purposes.
2013-01-10 00:32:22 +00:00
UbitUmarov
b70d50edf2
fix llGetRot and parameters prim_rotation for attachments. Only on
...
LSL_api to avoid side effects for now
2013-01-09 17:59:32 +00:00
UbitUmarov
b528281018
stop endless loop in lGetLinkPrimitiveParams
2013-01-09 17:01:09 +00:00
Melanie
27b0914681
Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the real
...
issue.
2013-01-09 16:01:00 +01:00
Melanie
e62b14024f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-04 22:39:07 +00:00
Justin Clark-Casey (justincc)
7232cedd2b
Set default particle burst count to 1 instead of 0 in any set particle system script call that does not have an empty list.
...
As per http://opensimulator.org/mantis/view.php?id=6353
2013-01-04 21:37:11 +00:00
Justin Clark-Casey (justincc)
7e45096314
Fix build break caused by missing ) from dce2809
.
...
Was hand-typing in a line of code I had tested before but not retested this time
2013-01-04 21:22:51 +00:00
Justin Clark-Casey (justincc)
dce2809137
Automatically grant sit-related llRequestPermissions() for subsequent avatars sitting on the same scene obejct, instead of wrongly popping up request permissions dialog.
...
Resolves http://opensimulator.org/mantis/view.php?id=6478
2013-01-04 21:18:53 +00:00
Justin Clark-Casey (justincc)
a3bf3a2aa5
refactor: simplify llGetNumberOfPrims() to return prim count + sitting avatar count rather than independently inspecting every scene presence
2013-01-04 20:56:39 +00:00
Justin Clark-Casey (justincc)
9869ca83b4
Fix llGetLinkName() to return the name of the last avatar sat as the last link number.
...
As per http://wiki.secondlife.com/wiki/LlGetLinkName
2013-01-04 20:54:11 +00:00
Justin Clark-Casey (justincc)
9503383887
Fix llGetLinkKey() to return the last sat avatar as the last link number.
...
As per http://wiki.secondlife.com/wiki/LlGetLinkKey
This is done by keeping a scene-object wide list of sitters.
This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim.
This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists
Addresses http://opensimulator.org/mantis/view.php?id=6477
2013-01-04 20:34:39 +00:00
SignpostMarv
a5ac6af16a
Improving documentation of AttachToAvatar and GetLine methods in LSL_Api.cs based on doxygen error output
2013-01-03 00:17:24 +00:00
Oren Hurvitz
1a6694b264
Fixed several problems with the Sun: some settings didn't work, or were inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
2013-01-02 23:16:24 +00:00
Justin Clark-Casey (justincc)
30e5e5cce6
If an NPC is unowned, then always auto-grant permissions requested via llRequestPermissions()
...
This is consistent with all other OSSL NPC functions that allow unowned avatars to be manipulated.
Aims to address http://opensimulator.org/mantis/view.php?id=6483
2013-01-02 19:25:52 +00:00
Melanie
7943c8d11c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-02 11:52:37 +00:00
teravus
92c26e4994
* ubit pointed out another place where that check needed to be updated and I normalized it.
2013-01-01 23:55:24 -05:00
teravus
f9148e5fc7
* This is actually the fix described the last commit.. I had commented it out to see if the problem had affected all attachments or just HUD attachments.
2013-01-01 23:11:46 -05:00
teravus
397aa74777
* Fixes the attachment scripted rotation bug. The problem is the code was relying on m_host.ParentId = 0 to determine if the attachment should be rotated against root prim offset. To fix it for attachments, we also need to check if the host's localID == RootPart's localID. otherwise we are cumulatively rotating against the host's root part rotation offset (which in this case, is it's own rotation)
2013-01-01 23:07:37 -05:00
Robert Adams
4914d6c0ea
Resolve Mantis 6480 ( http://opensimulator.org/mantis/view.php?id=6480 )
...
by reversing the sign on the recoil computation and adding a
[XEngine]RecoilScaleFactor parameter which defaults to zero.
Testing in SL seems to show that there is not a recoil action there.
Or, at least, it is very small. If someone knows how small, the default
for the scale factor should be changed.
2012-12-31 19:57:20 -08:00
Melanie
569f39e124
Merge branch 'master' into careminster
2012-12-21 22:13:41 +00:00