UbitUmarov
0f7ffc56ce
several changes for osTeleportObject
2017-04-15 10:46:18 +01:00
UbitUmarov
c0904a32cb
OSSL CheckThreatLevel() with no arguments only tests if OSSL is enabled. Faster test for safe functions that are always allowed with OSSL enabled. other name could be CheckOSSLenabled, but this name preserves functions template.
2017-04-05 15:11:19 +01:00
UbitUmarov
2805cb9dec
give osTeleportObject proper OSFunctionThreatLevel setting on osslEnable.ini
2017-04-05 01:15:44 +01:00
UbitUmarov
e237e1b2fa
add LSL_Integer osGetLinkNumber(LSL_String name). uses a cache for the string to linknumber map, cache invalidations may still be missing :(
2017-04-04 19:27:45 +01:00
UbitUmarov
ca250e0b0b
mantis 8740: rename osObjectTeleport as osTeleportObject, replaced the stop parameter by flags, add flags OSTPOBJ_STOPATTARRGET and OSTPOBJ_SETROT
2017-04-04 14:34:25 +01:00
UbitUmarov
2bb5e98574
add EXPERIMENTAL osObjectTeleport(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer stop)
2017-04-03 17:19:28 +01:00
UbitUmarov
6a35a965ff
add OSSL functions to override linksets total mass, center of mass and inertia. replacing the crude automatic estimation based on prims known to physics and density. Changed parameters are still not saved, and are lost on region crossings. only suported by UbODE. EXPERIMENTAL feature, only test it for now.. don't try to use in products.
2017-03-31 20:55:48 +01:00
UbitUmarov
0a5d6671ce
fix llScriptDanger(); don't call old ScriptDamage on ossl health functions
2017-01-21 06:37:29 +00:00
UbitUmarov
db2fbf6516
add more calls to effective permissions aggregation, some paths may still be missing on objects changes, but remove the aggregation on check paths, so all can be tested.
2017-01-17 13:24:09 +00:00
Melanie Thielker
556d95ef05
Revert "Allow OSSL scripts to softfail"
...
This reverts commit e5244fe708
.
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2017-01-07 23:36:07 +00:00
Melanie Thielker
f457925f80
Fix a compile issue and reintroduce the "GOD" script option
2017-01-07 23:12:51 +00:00
Melanie Thielker
c9736755d8
Merge branch 'master' of opensimulator.org:/var/git/opensim
2017-01-07 22:54:24 +00:00
Melanie Thielker
e5244fe708
Allow OSSL scripts to softfail
2017-01-07 22:53:46 +00:00
UbitUmarov
2d0860ac51
rename OSSL enable option GOD as ACTIVE_GOD so its use is more clear
2017-01-07 22:51:56 +00:00
UbitUmarov
e2167716aa
change OSSL enable option GOD to use IsGod, so it means a active god, as my original idea
2017-01-07 21:44:01 +00:00
Melanie Thielker
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
Melanie Thielker
ba1ca67afe
Re-add GRID_GOD because in some cases an "employee-only" level is simply needed
2016-12-23 19:48:03 +00:00
UbitUmarov
0887be3c12
replace the (hidden) GRID_GOD by a more usefull GOD so includes all types. This needs to be changed to current effective godlevel check (sp.GodLevel) when that is fixed. Automatic god powers need be (optionaly) removed
2016-12-23 03:42:50 +00:00
Melanie Thielker
2bfbd6ef2e
Change GRID_GOD script permission to do what it says on the tin.
...
Suggested by Mandarinka
2016-12-21 20:56:28 +00:00
Melanie Thielker
7286b27ff9
Add GRID_GOD to the list of values allowed for enabling OSSL functions
2016-12-21 14:35:34 +00:00
UbitUmarov
3056926403
dont self osDie attachments
2016-12-14 16:31:39 +00:00
UbitUmarov
553b326fb2
restrict osDie to objects rezzed by the script object group and a few more changes
2016-12-14 16:08:25 +00:00
Jeff Kelley
95d6396300
Add osDie(key)
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2016-12-14 15:14:22 +00:00
UbitUmarov
1ffc81c869
also reduce check threat level of osNpcSetProfileAbout to Low; update osslEnable.ini
2016-12-14 01:31:16 +00:00
UbitUmarov
1c08b3d8f9
also fox chekc threat level on osNpcSetProfileAbout
2016-12-14 01:16:21 +00:00
Melanie Thielker
a75c16e1bf
Fox threat level line on SetProfileImage. It is ALWAYS the name of the function!
...
Low is justified because setting an image requires having a NPC in the
first place....
2016-12-14 01:00:48 +00:00
Mandarinka Tasty
ec883d0f15
New OSSL function: osNpcSetProfileImage(LSL_Key npc, string image); This patch gives possibility to set image in created NPC's profile. You can use UUID of the texture or name of texture included in prim's inventory.
...
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2016-12-14 00:24:52 +00:00
UbitUmarov
d4e285b1a1
add osNpcSetProfileAbout(LSL_Key npc, string about) to set NPCs profile About text. requires OsNpcCreate rights
2016-12-06 17:05:02 +00:00
UbitUmarov
51104be6d4
remove SOG.FromPartID from main code and flag it obsolete
2016-12-04 17:56:47 +00:00
UbitUmarov
019910afbd
don't go seach for info we already have at hand.. and there is no region height on osGetRegionSize
2016-11-26 03:57:33 +00:00
UbitUmarov
f9b62b5680
work around viewers not suporting large regions on landmark creation. They still may display wrong offset; don't let inventory description be limited by asset description side on a ossl method
2016-11-24 20:53:04 +00:00
UbitUmarov
7201352074
bug fix: add a missing return; add some error messages
2016-09-22 22:08:21 +01:00
UbitUmarov
94e983c95f
mantis 8027: let osMessageAttachments also send to attachments child prims.. also changed its code structure and could not test
2016-09-22 17:05:05 +01:00
UbitUmarov
ddc2f2ccd3
mantis: 8008 unscripted child prim collisions didn't trigger scripted root prim collision events; collision sounds had incorrect aggregateevents call and default sounds where muted. Future optimization needed and Testing
2016-08-28 08:45:09 +01:00
UbitUmarov
78fa544f0d
experimental function. Results still too volatile to be usefull
2016-08-27 19:25:47 +01:00
UbitUmarov
b2386b8d0d
llCollisionSound(,value) back to disable all sounds. new osCollisionSound(..). allows defualt sounds with volume
2016-08-27 16:38:29 +01:00
UbitUmarov
a4caedceae
rename a few things to reduce confusion between regions wold location and grid location (a lot more elsewhere)
2016-07-31 01:56:44 +01:00
UbitUmarov
ec8101a24a
remove references to RegionCombinerModule
2016-07-28 00:34:16 +01:00
UbitUmarov
4b832f0f8e
add osGetHealRate(avatarkey) and osSetHealRate(avatarkey, healrate); healrate from 0 (disables auto heal) to 100 (maybe too fast) % per second. (untested)
2016-07-25 02:05:53 +01:00
UbitUmarov
2bb467e358
add osSetHealth() value from 1 to 100; (mantis 7973)
2016-07-24 16:31:29 +01:00
UbitUmarov
ac72598c6b
add OSSL osGetPhysicsEngineName(). this returns a string with name and version. does no permition checks or it whould be less usefull ( only ubOde returns value)
2016-07-04 08:29:26 +01:00
UbitUmarov
a08c354a07
fix NPCs OS_NPC_OBJECT_GROUP option. group ID needs to be set during creation, before scenepresence.CompleteMovement, set tittle just after it.
2016-06-28 18:14:30 +01:00
Melanie Thielker
48915377a6
Correct spelling and grammar, thanks Mata Hari
2016-05-30 19:04:19 +02:00
Mandarinka Tasty
77af32cdbf
Enhancement of osRegionRestart
...
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2016-05-30 15:58:39 +02:00
Melanie Thielker
e8b46023e4
Add osRequestURL and osRequestSecureURL with an options list.
...
Only currently supported option is "allowXss" which will send the needed
Access-control-allow-origin: * header to allow xss scripting against
the LSL http server.
2016-03-16 20:04:52 +01:00
UbitUmarov
ee15c51ba4
add npc create option OS_NPC_OBJECT_GROUP. with it the npc will be created with the group of the object with the script, if that object owner is member of that group. This should allow parcel access by group to work now, and not much else. The groupTitle will also be set, it the region option NoNPCGroup is not active.
2016-01-01 23:41:25 +00:00
UbitUmarov
b7ea5c4967
a few code cosmetic changes
2015-12-25 10:43:51 +00:00
Melanie Thielker
5f18f2ce6a
More EntityTransferContext plumbing
2015-11-01 19:37:14 +01:00
Melanie Thielker
69585a4824
More plumbing of the EntityTransferContext (not yet complete)
2015-11-01 19:11:14 +01:00
UbitUmarov
feb78b2910
add several options for NPC creation so abusive use can be reduced (restrictive by default) UNTESTED
2015-09-30 02:45:11 +01:00
UbitUmarov
1124d14eb0
remove some restrictions on NPCs creation
2015-09-29 22:15:56 +01:00
UbitUmarov
3e9b326fcc
clean some spacing issues
2015-09-29 21:44:25 +01:00
UbitUmarov
fb69661bb9
... ossl merge issue
2015-09-28 16:40:55 +01:00
UbitUmarov
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
Melanie
7633ebf36f
Add explicit initialization because mono 3 doesn't like what mono 2 allows
2015-08-19 23:18:40 +02:00
Melanie Thielker
662b59af83
Convert the lsl list type into a struct. EXPERIMENTAL! This may affect
...
the llSetPrimitiveParams family of functions adversely. Please test!
2015-08-19 23:14:11 +02:00
Melanie Thielker
c53f732163
Change the IScriptApi back to it's original form, removing XEngine
...
specific additions that should not have been there in the first place.
Sleeping and time measurement are now completely internal to XEngine
2015-08-17 21:46:30 +02:00
Melanie Thielker
ee7debcca6
Revert "When scripts are sleeping, don't count that as execution time"
...
The approach is good but the way it is written breaks the architecture.
Rewrite follows.
This reverts commit a568f06b7f
.
2015-08-17 18:11:45 +02:00
Oren Hurvitz
a568f06b7f
When scripts are sleeping, don't count that as execution time
...
Sleeping doesn't use the CPU.
2015-08-11 08:44:27 +01:00
Oren Hurvitz
2153a01cc7
Have osAvatarName2Key check the cache first, even for foreign users
...
Another change: removed the second call to userManager.AddUser(). UserManagementModule won't modify an existing record.
2015-08-07 11:34:52 +03:00
Christopher
86c426e587
create osGetAvatarHomeURI
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-04 18:09:13 +02:00
Christopher
b5be5ca490
Make osAvatarName2Key() able to get names from unknown HG users
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-08-04 18:08:54 +02:00
Christopher
bccf785665
osKey2Name returns now correct values for HG users who are not on the region.
...
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-08-02 09:17:50 +01:00
dahlia
5d3c327e93
Add a new os function "osGetGender()"
2015-05-29 23:02:12 -07:00
Robert Adams
2e1f5bb011
Temporarily comment out OSSL enabled warning log message.
...
Added in wrong place. It is printed once per script rather than once per region.
2015-04-14 11:30:14 -07:00
Robert Adams
e4e58fad32
Enable OSSL functions by default using the osslEnable.ini configuration file.
...
This changes OpenSim.ini.example to, by default, include osslEnable.ini which
turns on the OSSL functions and limits who can do which operations.
2015-04-14 07:17:54 -07:00
Robert Adams
9b337b089c
Add osCheckODE() function so scripts can configure for running with legacy physics engine.
...
Function returns 'true' of the physics engine is configured to be 'OpenDynamicsEngine'.
The presumption is that all other physics engines work the same (like SL) or it is a bug.
Does not require ossl functions to be enabled.
2015-04-12 19:30:55 -07:00
Robert Adams
07dead7dcb
varregion: any conversions of use of Constants.RegionSize converted into
...
Util.cs routines to convert region coords to and from world coords or handles.
2015-03-29 14:25:12 -07:00
Freaky Tech
773df94665
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 19:06:52 -05:00
ft@noemail
fb48ee1cb6
corrected script notecard parser. It now handles notecards with inventory as well.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 18:39:49 -05:00
BlueWall
c02636b6f3
Revert "corrected osMakeNotecard(string data) text length was calculated wrong. The Linden text format defines a byte count in that format."
...
This reverts commit b519a5e62a
.
The function works ok in-world but tests are failing. will revert for now.
2015-03-03 17:42:02 -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
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
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)
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
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
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
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
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
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)
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
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
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
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
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
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
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
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
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)
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
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)
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
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
Diva Canto
bb44758179
Switched to using the other Util function with a default value.
2013-02-27 20:59:16 -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
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
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
fc1c77b42d
Merge branch 'avination' into careminster
2013-01-23 19:31:27 +00: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
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
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
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
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)
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
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
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
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
Melanie
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
SignpostMarv
e977761071
adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex
2012-10-26 02:08:00 +01:00
SignpostMarv
18b1ee6f37
Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain
2012-10-26 02:08:00 +01:00
Justin Clark-Casey (justincc)
8af8319b95
Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if appearance notecard does not exist, rather than returning UUID.Zero or silently failing.
2012-10-25 03:02:00 +01:00
Justin Clark-Casey (justincc)
d9aaf51561
When scripts generate expected exceptions (e.g. due to checked bad parameter) throw ScriptException instead of just a plain old exception.
...
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests.
No functional changes.
2012-10-25 02:52:20 +01:00
Justin Clark-Casey (justincc)
ae662b54ea
Make osNpcCreate() return UUID.Zero instead of throwing an exception if notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception.
2012-10-25 01:07:06 +01:00
Melanie
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc)
756ac4f321
Correct osSetContentType() threat check to query osSetContentType rather than osSetResponseType
2012-10-10 01:39:47 +01:00
Justin Clark-Casey (justincc)
11d8119a21
Remove osDropAttachment threat level check wrongly placed in OSSL_Api.ShoutErrorOnLackingOwnerPerms.
2012-10-10 01:37:57 +01:00
Melanie
23d5bafa7f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-10-03 00:24:33 +01:00
SignpostMarv
a1679517d3
correcting typo
2012-10-02 22:14:47 +01:00
SignpostMarv
f555febdb7
taking into account the recent introduction of implicit operators
2012-10-02 22:14:46 +01:00
SignpostMarv
ce7694c108
added perms checking, duplicated functionality to methods that do not require perms and have higher threat level
2012-10-02 22:14:46 +01:00
SignpostMarv
c677c04f10
fixing copypasta
2012-10-02 22:14:46 +01:00
SignpostMarv
35b7c80e0b
implementing osDropAttachment & osDropAttachmentAt
2012-10-02 22:14:46 +01:00
Melanie
944b1ed237
Merge branch 'avination' into careminster
2012-09-29 21:47:08 +01:00
Melanie
7e21ddeeff
Fix a possible NRE
2012-09-28 00:15:14 +02:00
Melanie
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
SignpostMarv
e041f09750
refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
2012-09-08 00:44:27 +01:00
Melanie
924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
SignpostMarv
07dbe46ba3
wrapping attachment functions in a region
2012-09-04 00:03:44 +01:00
SignpostMarv
ff867b59cf
Implementing functing to send messages directly to attachments
2012-09-04 00:03:44 +01:00
SignpostMarv
d4b8a13a1d
refactoring the grunt work of MessageObject into a private method with a UUID argument
2012-09-04 00:03:44 +01:00