ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,798 Commits 5 Branches 89 Tags
dotnet6
Commit Graph

898 Commits

Author SHA1 Message Date
UbitUmarov
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
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
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
UbitUmarov
d554c0d574 normalize quaternion.Slerp outputs 2012-10-10 01:37:59 +01: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
48d8fbc9ae bug fix + make costs visible for testing 2012-10-07 08:53:55 +01:00
UbitUmarov
78ce7a0a04 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now
 2012-10-07 01:20:52 +01:00
Dan Lake
91ca3117cb Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric 2012-10-05 17:32:07 -07:00
UbitUmarov
9988558ec1 meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled 
for all physics engines)
 2012-10-03 23:14:56 +01:00
Melanie
001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
b9934fc4db Don't store undo states if a scene object is manipulated when it is not in a scene. 
Adds regression test for this.
 2012-09-26 23:31:10 +01:00
Justin Clark-Casey (justincc)
31c636f1e4 refactor: Change control structures in SOP.StoreUndoState() to reduce nesting. 2012-09-26 23:25:50 +01:00
Justin Clark-Casey (justincc)
36e3123069 Make it possible to rescale SOGs when they are not in a scene. 2012-09-26 23:17:21 +01:00
Justin Clark-Casey (justincc)
327320d1a7 Enforce existing 5 action hardcoded undo limit. 
This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source.
This commit enforces that limit, which will soon become configurable.
Regression test for undo limit added
Should help with http://opensimulator.org/mantis/view.php?id=6279
 2012-09-26 22:49:44 +01:00
Justin Clark-Casey (justincc)
90dd5844d6 Add basic undo/redo regression tests. 2012-09-26 21:28:43 +01:00
Melanie
a5d969d92f Comment out asset error for sculpts/meshes. If an asset is missing it's missing. 
We can't put it back so we don't need to know.
 2012-09-23 20:57:36 +02:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01: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
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
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
f8603a215d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-23 01:41:47 +01:00
SignpostMarv
481c00f50a refactoring out SetFaceColor 2012-08-20 23:10:25 +01:00
SignpostMarv
ede3b9ab07 making use of implicit operators and Util.Clip handling of Vector3 2012-08-20 23:10:25 +01:00
SignpostMarv
b863a15a82 single operation for PRIM_COLOR 2012-08-20 23:10:25 +01:00
SignpostMarv
aee4353e9c fix typo 2012-08-20 23:10:25 +01: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
SignpostMarv
7068fddd2f fixing bug that get/set the wrong property for prim types other than sphere & box 2012-08-17 23:23:03 +01:00
SignpostMarv
466d684fbe implemented 2012-08-17 23:23:03 +01:00
Robert Adams
57a9879669 Correct an exception report in SceneObjectPart so it outputs the stack. 2012-08-15 16:39:00 -07:00
SignpostMarv
ef4122213c enables configurable minimum sizes for physical & non-physical prims 2012-08-15 23:35:23 +01:00
Melanie
0c00abcce1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-08-03 16:46:11 +01:00
SignpostMarv
cd9fd77e2c ImprovedTerseObjectUpdate packet does not support shape updates, thus scheduling terse updates will not (and does not) update shape information in the viewer 2012-08-03 01:55:46 +01:00
UbitUmarov
d5f4fb7b50 Merge branch 'avination' into ubitwork 2012-07-17 00:54:23 +01:00
UbitUmarov
1dca94c72f don't subscribe collision events for nonphysical parts only because of 
collision sounds. Let them be passive
 2012-07-14 20:10:38 +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
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
89c9528e38 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-07-11 14:27:33 +01: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)
cdea572d2e refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() and SOP.RemoveSittingAvatar() 2012-07-10 23:50:04 +01:00