ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 14:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,469 Commits 5 Branches 88 Tags
72c925a6c9eb4dea6f9134db10c3af28ea83df48
Commit Graph

557 Commits

Author SHA1 Message Date
Melanie
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
Melanie
0ca9666932 Merge branch 'ubitwork' into avination 2012-10-17 20:46:38 +02:00
Melanie
416bc19da7 Merge branch 'avination' into careminster 2012-10-17 00:13:49 +01:00
Melanie
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
Melanie
8894f4ad77 Change permissions on child prim inventory items when god mode "force 
permissive" is used.
 2012-10-08 01:34:32 +02:00
UbitUmarov
78ce7a0a04 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now
 2012-10-07 01:20:52 +01:00
Melanie
b52311b8f8 Remove a core undo call that we don't need. 2012-09-27 17:16:39 +01:00
Justin Clark-Casey (justincc)
9eca154bce Make it possible to rescale SOGs when they are not in a scene. 2012-09-27 15:48:47 +01:00
Melanie
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
Justin Clark-Casey (justincc)
ebb394bbda Fix indentation and issues where tabs were used instead of spaces in commit 783ee949 2012-09-12 01:45:34 +01:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
Melanie
0d97beefce Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-09 13:30:24 +01:00
SignpostMarv
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
Melanie
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
Melanie
fd92560649 Merge branch 'avination' into careminster 2012-08-31 00:34:22 +01:00
UbitUmarov
a7281003d8 move keyframemotion.copy from sop.copy to sog.copy, where there is 
newgroup information avaiable.
 2012-08-30 01:30:56 +01:00
UbitUmarov
1eb7d963cf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-30 00:31:03 +01:00
UbitUmarov
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
Melanie
f671e446bf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-29 11:18:32 +02:00
UbitUmarov
2e54c3cc8f A few more changes to keyframes 2012-08-29 03:19:47 +01:00
Melanie
5284e514d5 Fix a nullref while object is being created 2012-08-28 22:16:01 +02:00
UbitUmarov
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
Melanie
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
Melanie
7fca69222b Merge branch 'avination' into careminster 2012-08-24 00:07:56 +01:00
Melanie
c1a0c7fad1 Fix bad child prim permissions that can make objects change perms after rezzing 2012-08-23 23:09:32 +02:00
Melanie
97c37c370b Merge branch 'avination' into careminster 2012-08-23 00:12:12 +01:00
Melanie
26224704de Cause a persistence save if prim flags change 2012-08-21 19:24:41 +02:00
Melanie
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
Melanie
bbac8f76fa Remove AreUpdatesSuspended flag because it does nothing 2012-08-16 01:18:32 +02:00
Melanie
b97053269b Change case of areUpdatesSuspended to upper case as is proper for a property 2012-08-16 01:02:20 +02:00
SignpostMarv
ef4122213c enables configurable minimum sizes for physical & non-physical prims 2012-08-15 23:35:23 +01:00
Melanie
b9c4a637b4 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-08-04 03:00:20 +01:00
Justin Clark-Casey (justincc)
5914270ff1 Restore SOG constructor chaining removed in recent 513b77b. This is not a functional change. 2012-08-03 22:15:06 +01:00
Melanie
0c00abcce1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-08-03 16:46:11 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
68406ab8f9 Initialize the Rezzing object to UUID.Zero 2012-08-02 22:34:46 +01:00
SignpostMarv
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
Melanie
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
UbitUmarov
1ff498266c minor changes, removed extra parts physics updates on linking nonroot 
prims
 2012-07-17 05:25:34 +01:00
Melanie
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
Melanie
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
Robert Adams
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
Melanie
906ac4adc4 Revert "Add instrumentation to log finalizer being called. Suppressed for backup" 
This reverts commit ea91a36483.
 2012-07-12 01:01:43 +02:00
Melanie
bae35ad97e Revert "Place instrumentation in the proper place. This needs reverting, too!" 
This reverts commit d9b0b03aa3.
 2012-07-12 01:01:29 +02:00
Melanie
d9b0b03aa3 Place instrumentation in the proper place. This needs reverting, too! 2012-07-11 23:54:45 +02:00
Melanie
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
Melanie
59cd0a2419 Change order of operations on backup to ensure keyframe motions are backed 
up properly
 2012-07-11 23:32:12 +02:00
Melanie
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
Justin Clark-Casey (justincc)
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