Diva Canto
806082cd6e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:35:01 -07:00
Diva Canto
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
70b5a2dace
refactor: Eliminate unnecessary SOP.m_physActor
2012-04-06 23:49:23 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
4a58d4c5a4
refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()
2012-04-06 23:36:13 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
47108bb351
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 21:15:31 +01:00
Justin Clark-Casey (justincc)
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
Talun
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
908cebbea8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:29:54 +01:00
Diva Canto
6a9f36788d
Deleted the unused and commented code from 2 commits ago.
2012-04-06 12:28:15 -07:00
Diva Canto
4c32f79c10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 11:52:38 -07:00
Diva Canto
7435582b70
If an AddItem fails, try adding it to the right folder type.
2012-04-06 11:52:05 -07:00
Diva Canto
25b3edc21c
WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
2012-04-06 11:51:12 -07:00
Diva Canto
953fe46811
A few minor tweaks here and there in XInventoryService.
2012-04-06 11:48:41 -07:00
Diva Canto
6eaff18961
Finish the implementation of GetUserInventory, even though it's still not used.
2012-04-06 11:38:47 -07:00
Diva Canto
8fd86c9156
Packing of folder in SendBulkUpdateInventory always set the folder type to -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
2012-04-06 11:24:34 -07:00
Diva Canto
e324fb2415
Guard against null inventory contents.
2012-04-06 11:22:30 -07:00
Diva Canto
cdbe34716f
Thank you, BaseHttpServer, for telling me where things go wrong.
2012-04-06 11:21:27 -07:00
Snoopy Pfeffer
67537f3596
Added missing refresh of group membership client side cache to the groups module. Before memberships of non active groups often were not stored in the cache (n_groupPowers).
2012-04-05 13:03:57 +02:00
Snoopy Pfeffer
8f45eb913c
Revert last commit
2012-04-05 11:10:05 +02:00
Snoopy Pfeffer
e4406c846d
Group based access restrictions to parcels require group membership, but not that this group is active for that user.
2012-04-05 10:25:54 +02:00
Snoopy Pfeffer
600a86bcae
Little bug fix in HasGroupAccess, to properly store the case "true" in the cache.
2012-04-05 10:02:18 +02:00
Melanie
a5d6b624f6
Simplify group access checks and break them out into a separate method.
...
Use existing cache if the avatar is within the region and use an
ExpiringCache to cache status if the avatar is not in the region. The
30 second delay now applies to scripted objects ony and only when the owner
is not present.
2012-04-05 00:45:58 +01:00
Snoopy Pfeffer
36c8fa16c0
Implements group based access restrictions for parcels of land. Because of caching there can be a delay of up to 30 seconds until the access rights are effectively changed for a user.
2012-04-05 00:53:40 +02:00
Melanie
6378abb966
Merge branch 'ubitwork'
2012-04-04 23:57:09 +02:00
Melanie
51d7bffb46
Merge branch 'master' into careminster
2012-04-05 00:48:27 +01:00
Melanie
77caa286a4
Remove some unneeded parens
2012-04-04 23:48:37 +02:00
Melanie
c7419a4d61
Adjust Snoopy's contribution for AVN
2012-04-05 00:36:30 +01:00
Melanie
3a0aac97b4
Merge branch 'master' into careminster
2012-04-04 23:57:50 +01:00
UbitUmarov
016079ef27
minor changes.. a few physicsactor -> pa and a use a constant with |'ed bit fields in place of 6 individual checks ||'ed
2012-04-04 18:24:56 +01:00
UbitUmarov
867d50d14c
remove more merge artefacts
2012-04-04 17:01:29 +01:00
UbitUmarov
787cc0d076
reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque).
2012-04-04 16:38:29 +01:00
UbitUmarov
823895b997
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-04 15:43:07 +01:00
Melanie
726915e9ef
Fix the last merge artefacts
2012-04-03 23:38:12 +02:00
Melanie
1bded840b9
More artefact
2012-04-03 23:25:34 +02:00
Melanie
dbec5e9859
Fix more merge artefacts
2012-04-03 23:22:47 +02:00
Melanie
7154d480b9
Remove duplicate implementation of Material { get; set; }
2012-04-03 23:18:07 +02:00
Melanie
1c4bcf3fed
Fix merge artefacts
2012-04-03 23:13:48 +02:00
Melanie
63c44719f7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-03 23:52:53 +01:00
Garmin Kawaguichi
9a9923405a
terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-03 20:06:03 +01:00
Justin Clark-Casey (justincc)
633f4bb3d8
remove possible PhysActor unexpectedly null race conditions when changing prim collision status
...
factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
2012-04-03 09:28:17 +01:00
Justin Clark-Casey (justincc)
e480e25d8b
Fix more SOP.PhysActor race conditions in LSL_Api
2012-04-03 06:01:05 +01:00
Justin Clark-Casey (justincc)
7468299673
Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code.
...
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
2012-04-03 05:51:38 +01:00
UbitUmarov
d5e123c106
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-01 11:20:11 +01:00
Melanie
1d8aefd22d
Merge branch 'master' into careminster
2012-03-31 02:33:16 +01:00
Melanie
6e7f13a72d
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 02:32:47 +01:00