4bf9c4bbb8
Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
...
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 20:25:32 +02:00
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
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
fc1c77b42d
Merge branch 'avination' into careminster
2013-01-23 19:31:27 +00:00
da6f589885
Add accessors to allow serializing rot and position targets
2013-01-21 08:36:21 +01:00
a291e6be93
Limit active at targets to 8
2013-01-21 01:47:54 +01:00
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
de49440839
dont send a full grp update on stopmovetotarget. just a rootpart terse
2013-01-16 22:17:10 +00:00
b924e333b7
Merge branch 'avination' into careminster
2013-01-13 13:44:28 +00:00
819f4b338d
remove redundant lastPhysGroupPos and lastPhysGroupRot checks
...
in SOG Update(). rootpart does more complet checks
2013-01-11 16:02:14 +00:00
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
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
569f39e124
Merge branch 'master' into careminster
2012-12-21 22:13:41 +00:00
d15bfcf614
Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
2012-12-18 19:25:40 -08:00
79bdf464d3
Merge branch 'avination' into careminster
2012-12-18 09:48:12 +00:00
b9939a46a1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-12-18 09:44:10 +00:00
861477d85e
Fix locking for good
2012-12-18 09:32:05 +01:00
8a95953bb7
BulletSim: experimentally remove unit displacement from prim border crossing test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change.
2012-12-16 21:19:12 -08:00
a5781ea9fc
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-12-17 01:59:50 +01:00
7d8c2b342c
Fix locking objects
2012-12-16 02:05:01 +01:00
d2695cb3f7
* Fix for Prim Locking. Prior to the merge, it was just a clone of the root part to each of the child parts.
2012-12-15 16:26:03 -05:00
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
e642b80a79
actually remove the use of random on persist timmings
2012-11-02 17:49:54 +00:00
b8c19fe1a9
Create a new random when needed using normal time based seed instead of
...
reusing a shared one than may not be valid
2012-11-02 17:40:17 +00:00
5b0fc60296
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2012-10-28 18:58:43 +00:00
1a34f42426
Add a property to determine if a link set is stored in the database. Also, fix
...
a bug where "Force object permissive" god action would fail to reset child prim
permissions.
2012-10-28 18:34:57 +01:00
8ce7ab721d
Merge branch 'ubitwork' into avination
2012-10-19 00:12:30 +02:00
afab5f5cd1
extend coment to include all unused SOG CheckSculptAndLoad()
2012-10-18 21:13:25 +01:00
7ab83f9eb2
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-18 21:13:02 +01:00
72c925a6c9
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
2012-10-18 20:56:34 +01:00
7228ad7a51
extend coment to include all unused SOG CheckSculptAndLoad()
2012-10-18 15:30:42 +01:00
0ca9666932
Merge branch 'ubitwork' into avination
2012-10-17 20:46:38 +02:00
416bc19da7
Merge branch 'avination' into careminster
2012-10-17 00:13:49 +01:00
aba078c93f
Fix perms when linking an object. Set root part perms to the perms
...
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
2012-10-14 17:32:46 +02:00
8894f4ad77
Change permissions on child prim inventory items when god mode "force
...
permissive" is used.
2012-10-08 01:34:32 +02:00
78ce7a0a04
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
2012-10-07 01:20:52 +01:00
b52311b8f8
Remove a core undo call that we don't need.
2012-09-27 17:16:39 +01:00
9eca154bce
Make it possible to rescale SOGs when they are not in a scene.
2012-09-27 15:48:47 +01:00
2bf42f30af
Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.
...
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
2012-09-27 00:12:34 +01:00
36e3123069
Make it possible to rescale SOGs when they are not in a scene.
2012-09-26 23:17:21 +01:00
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
ebb394bbda
Fix indentation and issues where tabs were used instead of spaces in commit 783ee949
2012-09-12 01:45:34 +01:00
21c476228a
Merge branch 'avination' into careminster
2012-09-10 13:53:00 +01:00
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
783ee949ea
implementing per-region configuration of limits on the number of prims one can have in a linkset
...
Applied with changes - patch was based on a repo different from core
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-09 12:59:25 +01:00
056e66b3de
Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into
...
it's own sub-method
2012-09-04 03:14:39 +02:00
fd92560649
Merge branch 'avination' into careminster
2012-08-31 00:34:22 +01:00
a7281003d8
move keyframemotion.copy from sop.copy to sog.copy, where there is
...
newgroup information avaiable.
2012-08-30 01:30:56 +01:00
1eb7d963cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 00:31:03 +01:00
c821153a4f
[possible still bad] make use of keyframemotion.copy on sop.copy, replacing
...
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
2012-08-30 00:15:46 +01:00
f671e446bf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 11:18:32 +02:00
2e54c3cc8f
A few more changes to keyframes
2012-08-29 03:19:47 +01:00
5284e514d5
Fix a nullref while object is being created
2012-08-28 22:16:01 +02:00
ef6e007a4c
[possible still very broken] mess around keyframes. timer events
...
threads overlaps, some null objects exceptions, region crossing...
2012-08-28 03:21:03 +01:00
c557684666
Fix bad child prim permissions that can make objects change perms after rezzing
...
Port from Avination
2012-08-24 00:15:30 +01:00
7fca69222b
Merge branch 'avination' into careminster
2012-08-24 00:07:56 +01:00
c1a0c7fad1
Fix bad child prim permissions that can make objects change perms after rezzing
2012-08-23 23:09:32 +02:00
97c37c370b
Merge branch 'avination' into careminster
2012-08-23 00:12:12 +01:00
26224704de
Cause a persistence save if prim flags change
2012-08-21 19:24:41 +02:00
aee7a31bc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-18 13:17:39 +01:00
bbac8f76fa
Remove AreUpdatesSuspended flag because it does nothing
2012-08-16 01:18:32 +02:00
b97053269b
Change case of areUpdatesSuspended to upper case as is proper for a property
2012-08-16 01:02:20 +02:00
ef4122213c
enables configurable minimum sizes for physical & non-physical prims
2012-08-15 23:35:23 +01:00
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
5914270ff1
Restore SOG constructor chaining removed in recent 513b77b. This is not a functional change.
2012-08-03 22:15:06 +01:00
0c00abcce1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-08-03 16:46:11 +01:00
513b77b78d
refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
2012-08-03 02:26:54 +01:00
08ec18f8a3
Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this is already its default value as it's a struct.
2012-08-03 02:08:04 +01:00
68406ab8f9
Initialize the Rezzing object to UUID.Zero
2012-08-02 22:34:46 +01:00
cd2c5843a8
reduced-complexity implementation of function to get rezzing object key
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-02 22:12:36 +01:00
36d744e2a5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-07-19 09:47:51 +01:00
1ff498266c
minor changes, removed extra parts physics updates on linking nonroot
...
prims
2012-07-17 05:25:34 +01:00
c256447f46
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-16 22:22:42 +01:00
d632fd7124
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-07-12 08:55:16 +01:00
743437262e
Many explanitory comments added to the link and delink code in
...
SOG and SOP. Should have no functionality changes.
2012-07-11 16:12:38 -07:00
906ac4adc4
Revert "Add instrumentation to log finalizer being called. Suppressed for backup"
...
This reverts commit ea91a36483
2012-07-12 01:01:43 +02:00
bae35ad97e
Revert "Place instrumentation in the proper place. This needs reverting, too!"
...
This reverts commit d9b0b03aa3
2012-07-12 01:01:29 +02:00
d9b0b03aa3
Place instrumentation in the proper place. This needs reverting, too!
2012-07-11 23:54:45 +02:00
ea91a36483
Add instrumentation to log finalizer being called. Suppressed for backup
...
interim copies to avoid spammage. Not for release to the grid, must be
reverted first!
2012-07-11 23:33:13 +02:00
59cd0a2419
Change order of operations on backup to ensure keyframe motions are backed
...
up properly
2012-07-11 23:32:12 +02:00
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
2eaa6d5ace
Do not allow a script to attach a prim if its being sat upon.
...
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
2012-07-09 21:24:32 +01:00
7ff4eec79c
Remove redundant SetScene() function in Scene.AddSceneObject()
...
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks.
There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
2012-07-07 00:02:45 +01:00
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
5776351f6a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-05 22:17:39 +01:00
8183c2926d
minor: Add some method doc to HasGroupChanged and Schedule GroupForFull/PartUpdate() to indicate when region modules need to invoke them
2012-07-03 23:19:11 +01:00
7cc5b3d7d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-26 17:35:55 +01:00
fda39c11bf
Fix bug where attachments would not retain position if just rotated and not moved.
...
This was because we were not setting AttachedPos in SOG.UpdateGroupPositionPR, unlike UpdateGroupPosition
2012-06-22 01:33:27 +01:00
eab211f94d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-21 01:10:13 +01:00
68ea096f1b
Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instead of magic numbers
2012-06-20 23:25:07 +01:00
8cf414ba32
*CHECK/REVIEW* comented out not used sp.ParentPosition. Comented out SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment )
2012-06-17 11:38:40 +01:00
ff21007b93
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-15 15:48:34 +01:00
a4290048e5
Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private.
...
Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations.
This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs.
It appears this is no longer true with Neck and Root (Avatar Center)
2012-06-14 01:20:55 +01:00
36117e079a
Merge branch 'master' into careminster
2012-06-14 00:57:05 +01:00
cd49949478
change object drag so it applies a impulse and not a push force so it works as before my fix to impulse/forces
2012-06-11 22:43:35 +01:00
69dd5b855a
Merge branch 'avination' into careminster
2012-06-07 23:34:22 +01:00
f5cbe56c56
Make not_at_target stop when the target is reached even if the script
...
is not listening to at_target
2012-06-07 19:01:33 +02:00
78e657fd8d
Merge branch 'avination' into careminster
2012-05-27 19:35:36 +01:00
d69f197a5d
Fix setting positions of attachments. The recent security fix regarding
...
prim entry messed it up.
2012-05-19 12:35:07 +02:00
e7819ce909
Port Avination's collision fixes to core.
2012-05-15 01:02:38 +01:00
71115c32ad
Merge branch 'avination' into careminster
2012-05-14 23:33:16 +01:00
e3c376156c
Completely revamp collision handling. Now works as it is supposed to.
2012-05-14 22:45:54 +02:00
e78043cb70
Check parcel entry permissions when moving objects
2012-05-14 01:32:22 +02:00
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
1120a2cf36
Merge branch 'avination' into careminster
2012-05-07 12:07:42 +01:00
b60f51dafc
Stop llSetPos from sending one update per child prim
2012-05-06 19:21:54 +01:00
e3226aecd9
SOG: tell physics about when we want a force or a impulse. (sorry add to change here also)
2012-05-05 10:47:51 +01:00
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
58a1a0710c
SOG copy bug fix, now new group has own empty list of sitted avatars. Also changed crossing code to restore sitting avas in case of group cross fail
2012-05-04 11:32:37 +01:00
8b1cc0dd29
Merge branch 'avination'
2012-05-03 00:15:45 +02:00
a135e51d23
Improved sitted avatars crossings ( plus tests on vehicles)
2012-05-02 22:08:09 +01:00
58d460542d
Merge branch 'avination'
2012-05-02 00:33:56 +02:00
82197c87a2
Merge branch 'ubitwork' into avination
2012-05-02 00:33:37 +02:00
e6e12c2d42
Merge branch 'avination'
2012-05-02 00:32:28 +02:00
fc3cf2b5a3
Fix saving of attachment positions
2012-05-01 23:21:28 +02:00
84b5b3e89b
llGetGeometricCenter...
2012-04-29 06:39:09 +01:00
c7c0d5558b
remove repeated set of group rotation to physics
2012-04-29 01:00:46 +01:00
df9935273f
SOG bug fix in group rotations updates
2012-04-29 00:41:51 +01:00
174fa4a70f
Merge branch 'avination'
2012-04-29 01:33:40 +02:00
dd745f60c2
fix llGetCenterOfMass ( checked with ubitODE only)
2012-04-28 21:36:38 +01:00
db31c9fe58
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-25 19:15:40 +01:00
88553bb884
Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis #5990
2012-04-25 19:09:22 +01:00
22ea2ef9a0
set PIDHoverTau and not PIDTau since all physics need that
2012-04-25 17:11:32 +01:00
816a44d6da
SOG bug fix in UI object changes
2012-04-24 21:48:12 +01:00
159b3b27ca
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-23 21:13:08 +01:00
e903709847
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-04-23 20:44:41 +01:00
8df4bd14f5
Merge branch 'master' into careminster
2012-04-22 15:06:06 +01:00
9ac48b2aff
Fix a bug where linking a non-physical prim with a physical prim as root would make the non-physical prim phantom rather than part of the physics object.
...
On region restart, the whole object would become physical as expected.
Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim.
Add regression test for this behaviour.
2012-04-21 01:43:09 +01:00
3b56c44453
changed seletion code. SOP now knows about parts selection. UI actions are sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects
2012-04-20 18:51:32 +01:00
65b3e13010
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-20 00:17:14 +01:00
fc9f244a7d
Merge branch 'master' into careminster
2012-04-18 00:28:33 +01:00
859646ef5c
minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions.
2012-04-17 23:54:51 +01:00
0fe0b2ceec
Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death)
2012-04-17 23:39:41 +02: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
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
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
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
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
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
726915e9ef
Fix the last merge artefacts
2012-04-03 23:38:12 +02:00
1bded840b9
More artefact
2012-04-03 23:25:34 +02:00
1c4bcf3fed
Fix merge artefacts
2012-04-03 23:13:48 +02:00
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
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
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
32a953fed7
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
2012-03-31 01:52:06 +01:00
f0406f9fe2
Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ContainsPart method and remove method duplication.
...
HasChildPrim is also misleading since the 'root' prim can also be returned.
2012-03-31 01:45:37 +01:00
808995fb68
Merge branch 'ubitwork'
2012-03-19 14:25:11 +01:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
ae8e089b9c
some more work on costs
2012-03-16 15:33:49 +00:00
a4b01ef38a
Replace script-lines-per-second with the script execution time scaled by its measurement period and an idealised frame time.
...
The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute.
Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100.
The actual measurement value should be script execution time per frame but XEngine does not work this way.
Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time.
This is still not ideal but gives reasonable results and allows scripts to be compared.
This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
2012-03-16 00:34:30 +00:00
cf9ebd301c
bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
2012-03-14 18:24:04 +00:00
bf2a5508de
bug fix
2012-03-13 19:17:32 +00:00
22e0cc09ac
Ensure child prims of a phantom prim are marked as phantom
2012-03-13 13:12:14 +01:00
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
edc8a15487
Restore duplication of the SL bug where linking phantom to solid lets the
...
child prim remain phantom
2012-03-12 14:06:39 +01:00
dab7e03584
bug fix (??) in sog copy()
2012-03-11 08:43:53 +00:00
80160c128d
coments change..
2012-03-11 02:58:56 +00:00
dba0d79833
minor changes on updates control on doChangeObject(..)
2012-03-11 02:55:39 +00:00
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
e83a2181d0
on linking update linked parts physical flags acording to new parent ones ( untested )
2012-03-09 17:19:10 +00:00
05cdf9bda9
more changes in undo/redo. Basicly moved control to llclientview.cs. later we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
2012-03-09 01:53:58 +00:00
3d3b81e676
changes on undo/redo (untested/incomplete). Think we may consider moving this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy )
2012-03-07 07:31:26 +00:00
de03d1ece0
Removed some whitespace errors - don't be naughty, don't use hard tabs!
...
Also removed commented code block.
2012-03-06 09:56:19 +01:00
cca94aaefc
make copied parts have diferent LocalIds than original. More building control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
2012-03-06 05:13:39 +00:00
6dc4a6dfb1
Zero velocity when drag-copying
2012-03-04 00:06:07 +01:00
fca8c82232
Move KeyframeMotion from SOG to SOP because we can't persist it any
...
other way because SOG doesn't technically exist in the DB
2012-02-26 18:11:38 +01:00
ac1e30156a
Implement proper selection behavior
2012-02-26 15:09:00 +01:00
8cdc115c91
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
...
code.
2012-02-26 14:30:24 +01:00
aa552d0526
Serialize Keyframe motion for region crossings
2012-02-26 12:29:35 +01:00
e9120890a2
Merge branch 'ubitwork'
2012-02-26 02:41:41 +01:00
c82709c0d6
Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.
2012-02-26 02:36:34 +01:00
e07440d0c5
changed SOP Force and Torque, adding XML (de/)serialization, also changed Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
2012-02-25 22:20:25 +00:00
e74bf46007
Prevent a nullref when nonphysical motion objects cross sim boundaries
2012-02-23 23:18:01 +01:00
8f8206f478
Add an override to make SOG.Velocity work as expected
2012-02-20 16:55:12 +01:00
96409cc2ee
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
2012-02-19 20:08:01 +01:00
b77d354e6d
moved vehicle from SOG to SOP
2012-02-19 13:21:01 +00:00
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
3aee642190
changed how vehicle data is stored and passed to physics. use unsafe in serializer, tried to control m_dupeInProgress
2012-02-18 17:42:14 +00:00
91a326331f
vehicle parameters do cross (i hope) on regions in same instance ( others need xml)
2012-02-18 16:16:48 +00:00
5351ff925c
let SOG know about vehicles. Still needs serialization and applyphyscis on deserialize, etc
2012-02-18 14:08:42 +00:00
4486b7d8e8
Fix: Object owned by the group does not return to the last owner http://opensimulator.org/mantis/view.php?id=5404
2012-02-16 03:35:18 +00:00
3bffdddc9d
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 22:04:17 +01:00
b59275355e
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 19:44:54 +00:00
a758abaa9f
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 17:08:33 +00:00
f6f0d884bd
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 16:44:15 +01:00
04279e36d1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-15 03:51:30 +00:00
2d3381b795
Implement region crossing of sitting avatars. Edit mode and llSetPos work
...
but unscripted default sit anim is lost. Still some Gfx glitching. Physical
crossing doesn't work yet.
2012-02-14 23:16:20 +01:00
e321306517
Prevent object loss and positioning outside the region with failed object sim
...
crossings
2012-02-14 00:02:53 +01:00
e3f5fd81f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
prebuild.xml
2012-02-10 23:03:30 +00:00
7c888f6af1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-02-09 00:19:37 +00:00
6af01f6767
initial introdution of physics actor building control.
2012-02-08 23:14:53 +00:00
dfa19e23f0
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
...
Aims to address http://opensimulator.org/mantis/view.php?id=5878
2012-02-08 22:19:34 +00:00
236e1c45f2
Merge branch 'master' into careminster
2012-02-07 23:30:48 +00:00
c87751a822
Add start GC memory and end GC memory to object stress test printouts.
...
This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general).
This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
2012-02-07 23:03:53 +00:00
54fc78013d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-02-05 20:58:04 +00:00
4e11983c7c
Make configuration uniform
...
Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
2012-02-05 12:38:20 -05:00
6fe4b6fbe8
Fix remembering attachment point and position when an item is rezzed in world.
...
Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script
in the root.
2012-02-02 02:51:59 +01:00
16aa00e944
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-01 10:08:45 +00:00
ab89adfaef
Implement "show object uuid <uuid>" console command.
...
This will show details about a part with the given uuid if it's found.
2012-01-31 23:03:39 +00:00
abffda269f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-01-28 04:05:53 +00:00
154ba0124a
Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner.
2012-01-28 02:21:41 +00:00
e1a2c44ebe
Cleaned up the LookAt code in SOP and SOG. Added support for incrementally
...
rotating physical objects. This does not use physics. Currently the rate
of change is determined as 1 / (PI * Strength).
2012-01-13 14:48:56 -08:00
32b8fa4a77
Prevent spurious "CHANGED_POSITION" during region backup
2012-01-05 07:37:09 +01:00
b8a914b15b
Merge branch 'master' into careminster
2011-12-23 01:00:34 +00:00
f394cb2e8f
fix the UsesPhysics flag to reference the physics flag rather than the temponrez flag
2011-12-22 16:21:32 -08:00
eef6f92029
Merge branch 'master' into careminster
2011-12-22 19:52:59 +00:00
f7dbdba447
Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()
2011-12-22 19:52:09 +00:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
8a9a8ed5c9
Fix hit testing link sets properly. Fix raycasting for LSL.
2011-12-17 12:31:25 +01:00
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
1bf05fbb1f
refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
2011-12-17 00:11:17 +00:00
a3a17e929e
Stop generating client flags when we send out full object updates.
...
These were entirely unused.
2011-12-16 23:20:12 +00:00
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
f43e5f92fd
Just adding a comment to SendFullUpdatToClient
2011-12-13 23:34:59 -08:00
5490a3e549
Fix phantom and temp flags not taking
2011-12-06 19:44:45 +01:00
df35720cf5
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneViewer.cs
2011-11-14 20:34:49 +00:00
5fd1749150
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
...
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack
Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
2011-11-11 17:16:52 -08:00
9359293b11
Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes.
2011-11-10 15:20:21 -08:00
e9055cec17
Merge branch 'master' into bigmerge
2011-11-10 23:44:19 +00:00
4939d99b57
Merge branch 'master' into bigmerge
2011-11-10 23:03:50 +00:00
f3fea81936
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 14:09:53 -08:00
18c625bda6
When updating SOG, a physics taint should not override a full update with a terse update
2011-11-10 14:09:35 -08:00
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
4f6915bad5
minor: Correct misleading method doc on SOG.UpdateRootRotation()
2011-11-09 21:49:08 +00:00
323b76cee4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-11-06 20:54:13 +00:00
c7dd7b13a2
Convert SendKillObject to take a list of uint rather than sending one
...
packet per prim. More to come as we change to make use of this.
2011-11-06 20:38:07 +00:00
03f5bbcaf2
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:17:40 +00:00
e3885625a0
Don't rotate child prims, if only the root prim is rotated.
2011-11-05 02:26:25 -07:00
c803ed28c3
Replacing te linking code with the code from Avination. Link sets prims are now
...
numbered properly even when sets are linked to sets.
2011-11-05 00:09:37 +00:00
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
b8d50b10fb
Rename ForEachAvatar back to ForEachScenePresence. The other changes
...
from previous commit which sort out which iterator is used are left
intact. A discussion is needed as to what constitutes an avatar vs a
ScenePresence.
2011-11-03 17:53:51 -07:00
94dc7d07eb
Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
...
the 3 iteration functions so more of them are using the correct
iteration for the action they are performing. The 3 iterators that seem
to fit all actions within OpenSim at this time are:
ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar
There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.
2011-11-03 17:06:08 -07:00
26a4f32013
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-02 23:42:37 +01:00
243acef917
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-03 00:06:14 +00:00
ce8419fdd0
Fix link order when linking sets to sets
2011-11-02 23:42:09 +01:00
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
61e97ee4c8
Remove completely unused SOG.Rotation parameter
...
We always use SOP.Rotation instead
2011-10-29 00:39:01 +01:00
c2da1c4580
set grp.RootPart.GroupPosition for code consistency (and readability) rather than calling SOP.OffsetForNewRegion
2011-10-28 23:43:31 +01:00
9bf8c3e7b7
Add missing doc to rotation/position methods in SOG
2011-10-28 23:38:57 +01:00
e2de57ca29
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:26:56 +01:00
585f1b189f
Merge
2011-10-25 02:08:43 +01:00
3cdea11e29
Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge
2011-10-25 01:54:07 +01:00
5ddefc2564
remove now redundant m_physical_prim flag from SOP.ApplyPhysics()
2011-10-15 02:47:27 +01:00
Melanie