a366c05ae2
Added ability to exclude inventory items or folders when saving IAR files.
2012-04-13 23:31:12 +01:00
47ba9d9429
Merge branch 'master' into careminster
2012-04-13 23:29:10 +01:00
eced091689
Change threat level of osNpcStopMoveToTarget from Low to High to match other NPC functions, and change OSSL permissions name to osNpcStopMoveToTarget instead of osNpcStopMoveTo
...
Thanks to Oren Hurvitz for pointing out these mistakes.
2012-04-13 22:52:24 +01:00
1ad3fdb40b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-13 22:34:36 +01:00
ab7c0e7547
Remove hardcoded god requirement from osSetRegionWaterHeight, osSetRegionSunSettings and, osSetEstateSunSettings no matter the threat level.
...
Change threat level on osSetRegionSunSettings and osSetEstateSunSettings from nuisance to high to match similar functions.
If you had enabled these functions but had relied on the hardcoded god check in the code, then please adjust your OSSL permissions config.
Thanks to Oren Hurvitz for pointing this out.
2012-04-13 22:32:33 +01:00
b574d43c5d
Use presence absolute position to request raycast to camera. Used m_pos maybe a sitting offset. For reasons i don't understand that also seems to crash ode more when i let this rays colide with heighmaps (ubitODE with normal ode lib).
2012-04-13 20:34:56 +01:00
5da77e047a
don't do Animator.UpdateMovementAnimations() in scenepresence RegionHeartbeatEnd if agent is sitting. Also restore Velocity in teleportWithMomentum()
2012-04-13 17:50:03 +01:00
5e3a76361f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-13 03:03:44 +01:00
fe65b51876
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-13 03:00:48 +01:00
08e509978d
Mantis 55025 Implement script time.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-12 18:44:00 -07:00
30d8506bc2
make changes to FlotsamCache.ini.example as noted in mantis #5960
...
http://opensimulator.org/mantis/view.php?id=5960
2012-04-12 18:27:14 -07:00
4a67e8b98f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
2012-04-11 23:35:27 +01:00
8be14095fe
HGFriendsModule: Type casts to fix compile error
2012-04-11 18:56:28 +02:00
1f4d3d3582
HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users.
2012-04-11 18:52:07 +02:00
f2ede8c7e0
HGFriendsModule: add the scaffolding for supporting permissions pertaining to HG friendships. Snoopy take it from here.
2012-04-11 08:13:11 -07:00
78fd487a70
New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as originally proposed in SL Jira ( https://jira.secondlife.com/browse/SVC-244 ).
2012-04-10 21:49:43 +02:00
4ab479bf58
Add uri to various log messages when region registration fails. Upgrade some debug log messages to error.
2012-04-10 20:40:59 +01:00
fb44e7b636
minor: convert tabs to spaces in config example files from recent 7c534e5
2012-04-10 17:46:34 +01:00
2b339bfd97
Correct max_listeners_per_region in OpenSimDefaults.ini to max_listens_per_region
...
Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect
Thanks to Ovi Chris Rouly for pointing this out.
2012-04-10 17:22:02 +01:00
f9dd4ed89c
Do not timeout group member cache entry, as long as there are frequent group membership requests. These are caused by movements within the parcel boundaries.
2012-04-10 15:51:26 +02:00
c4a9eae961
make llGetGeometricCenter() work as in current SL. Now this is not real geom center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine.
2012-04-09 23:33:42 +01:00
a45ff62adb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-09 21:40:41 +01:00
67d4f1d66c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-09 21:40:03 +01:00
78c0028179
Mantis5502 implementation of some of the new constants
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-09 21:25:22 +01:00
39079a62c0
chODE and ubitODE always return prim mass (they where returning object mass on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
2012-04-09 20:58:40 +01:00
87fdb2ed7e
llGetMass and llGetObjectMass (and push estimation) always use object mass as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL.
2012-04-09 20:53:29 +01:00
ad544bdd3d
sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set sop.PhysActor, so made it return void.
2012-04-09 18:03:37 +01:00
0f277dfa17
Addresses mantis #5846
2012-04-08 17:54:59 -07:00
6b5b73bfae
Fix a LSL merge artefact
2012-04-08 13:18:03 +02:00
a25d12d166
Merge branch 'master' into careminster
2012-04-08 02:25:48 +01:00
d4a370a5f2
A few more minor improvements on Suitcase inventory service.
2012-04-07 14:52:15 -07:00
7c534e558d
Added gatekeeper and uas addresses to grid info, so that viewers can take advantage of that info.
2012-04-07 14:38:32 -07:00
0d566aa385
Better Suitcase Inventory Service.
2012-04-06 21:52:48 -07:00
b39de2425c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-07 04:52:14 +01:00
806082cd6e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:35:01 -07:00
9637e50956
Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
2012-04-06 20:34:31 -07:00
cce760dbfc
Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead.
...
This reduces pointless memory usage.
2012-04-07 00:40:55 +01:00
7d8bb33c5b
Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry.
...
This eliminates some pointless memory use.
2012-04-07 00:33:02 +01:00
70b5a2dace
refactor: Eliminate unnecessary SOP.m_physActor
2012-04-06 23:49:23 +01:00
33e91f1088
Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL functions.
...
This is the same as PRIM_POSITION
2012-04-06 23:43:03 +01:00
4a58d4c5a4
refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()
2012-04-06 23:36:13 +01:00
3af1cd65f9
Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene or attachments.
...
Return relative position to root prim rather than 0,0,0.
Should fix same issue with llGetLocalPos()
http://opensimulator.org/mantis/view.php?id=5951
2012-04-06 22:41:35 +01:00
47108bb351
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 21:15:31 +01:00
f2903db390
For llGetMass(), return the mass of the avatar is the object is attached.
...
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
This is the mass as used by the physics engine (ODE or Bullet).
2012-04-06 21:14:19 +01:00
c3a8c00ce0
Addition of missing constants for llGetObjectDetails including for Mantis 5502
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-06 12:42:46 -07:00
627efc172b
Make llGetMass() return total mass of object when called on root prim.
...
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
2012-04-06 20:32:39 +01:00
908cebbea8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:29:54 +01:00
6a9f36788d
Deleted the unused and commented code from 2 commits ago.
2012-04-06 12:28:15 -07:00
4c32f79c10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 11:52:38 -07:00
7435582b70
If an AddItem fails, try adding it to the right folder type.
2012-04-06 11:52:05 -07:00
Kevin Cozens