ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-19 03:36:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,653 Commits 5 Branches 102 Tags
b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4
Commit Graph

330 Commits

Author SHA1 Message Date
Melanie Thielker
9afe2b018f Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore prior functionality. 
Avination code wasn't designed for deep building.
 2015-11-26 17:29:50 +01:00
UbitUmarov
ca4b7efd0f dont find parts of groups marked as Deleted 2015-11-16 21:11:22 +00:00
UbitUmarov
7cb6ecb9f5 Make physics engines finish internal representation of loaded prims before starting simulation so it does start for all at same time. Currently only in use by ubOde 2015-10-22 17:34:28 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
Diva Canto
218eb908be In SceneGraph, use the property PhysicsScene instead of the variable _PhysScene, so that it gets properly initialized before being dereferenced. 2015-09-04 10:54:04 -07:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto
11194209df First commit where physics work as region module. 
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
 2015-08-31 14:09:15 -07:00
Diva Canto
ce2c67876e More namespace and dll name changes. Still no functional changes. 2015-08-30 21:05:36 -07:00
Diva Canto
2c0cad6dd3 Renamed the namespaces too 2015-08-30 20:29:31 -07:00
Glenn Martin
1959eb8372 Moved over metrics from previous OpenSim 0.8.0.3 repository (this new repository is now the master branch from OpenSim). 2015-04-21 14:29:17 -04:00
UbitUmarov
d9d58a7b33 some code reorder/minor changes 2014-10-25 23:00:41 +01:00
UbitUmarov
c82e456345 debug show stack trace 2014-09-22 21:13:36 +01:00
UbitUmarov
ea4a526095 a few more changes on link/unlink 2014-09-22 16:09:39 +01:00
UbitUmarov
b7fca5bcac same in a few more spots 2014-09-22 14:44:47 +01:00
UbitUmarov
fe3c1b9e98 send to world or backup, after setting finding information 2014-09-22 14:32:56 +01:00
UbitUmarov
bcaf202e34 update scenegraph group find by part information in sog link, so script link functions do update that also. 2014-09-22 13:59:23 +01:00
UbitUmarov
8e15d4ad57 limit number of prims on physical objects. Not all cases covered still 2014-09-08 23:58:49 +01:00
Justin Clark-Casey (justincc)
099212167b Implement STATUS_BLOCK_GRAB_OBJECT in llSetStatus()/llGetStatus() and correct effect of STATUS_BLOCK_GRAB 
As per http://wiki.secondlife.com/wiki/LlSetStatus
Setting STATUS_BLOCK_GRAB_OBJECT prevents or allows move of a physical linkset by grab on any prim.
Setting STATUS_BLOCK_GRAB prevents or allows move of a physical linkset by grab on a particular prim.
Previously, setting STATUS_BLOCK_GRAB would prevent drag via all prims of the linkset.
 2014-08-29 23:40:21 +01:00
Oren Hurvitz
f94b3bbe0f Minor: changed "existant" to "existent" 2014-07-21 09:15:05 +01:00
Oren Hurvitz
0301c81b01 Made GetScenePresence() case-insensitive when searching by user name. This makes it easier to use console commands such as "show appearance". 2014-04-02 13:08:31 +01:00
Justin Clark-Casey (justincc)
0af8886400 Fix problem where moving an object to another region on the same simulator was failing, with the object returning to its original position. 
Root cause was that PrimLimitsModule was not properly handling the case where the parcel it was asked to check was outside the current region's bounds.
If this is the case, we can abort the check since the receiving region will perform it.
Added a regression test for this case.
 2014-04-02 00:58:33 +01:00
Justin Clark-Casey (justincc)
7da10850b0 Fix bug where removing a physical linkset would only decrement the Active Objects statistic by 1 instead of by the number of prims removed. 
Unlike LL, OpenSimulator currently uses this stat to record the number of prims in the physics simulation, even when they are at rest.
Added regression test for this case.
 2013-11-13 23:25:54 +00:00
Melanie
008c98a974 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Region/RestartModule.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-09-01 22:49:31 +01:00
Justin Clark-Casey (justincc)
065c5839b5 Refactor: merge SceneGraph.AddScenePresence() into CreateAndAddChildScenePresence() since the former was only ever called from the latter 
This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
 2013-08-23 00:49:13 +01:00
Melanie
81ad9255b5 Hook up Keyframe motion to almost everything. Failing to cross a sim border 
may yield unexpected results in some cases. No database persistence yet,
 2013-06-06 03:03:05 +01:00
Melanie
7bf33d333a Plumb the path from the client to the extra physics params and back 2013-02-07 22:25:28 +00:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
 2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc)
81aeecc907 Allow "show object", "show part", "dump object" and "delete object" to accept a local ID as well as a UUID. 
This means that the sub-commands are now id rather than uuid, e.g. show object id
 2012-10-24 04:10:22 +01: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
007a45aa76 Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster 2012-08-25 18:08:10 +01:00
Justin Clark-Casey (justincc)
cd325fdf02 Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down into the 3-parameter AddNewSceneObject() method instead of always hardcoding true. 
This doesn't affect any core OpenSimulator code since all callers were passing true anyway
But it allows region modules to create objects that are never persisted.
 2012-08-24 21:36:20 +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
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
fc77bca936 Committing Avination's memleak fix-a-thon, installment #3 
When linking, detach the no longer used SOG's from backup so they can be
collected. Since their Children collection is never emptied, they prevent
their former SOPs from being collected as well.
 2012-07-23 19:53:26 +01:00
Melanie
7da744566d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-20 09:31:06 +01:00
Justin Clark-Casey (justincc)
e9a121e1b2 Add TestCreateDuplicateRootScenePresence() regression test. 2012-07-19 21:54:50 +01:00
Melanie
89c9528e38 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
 2012-07-11 14:27:33 +01:00
UbitUmarov
7836933133 Melanie fix: detach SOGs from backup on linking 2012-07-11 03:58:58 +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)
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
Justin Clark-Casey (justincc)
056c9a59b2 Add assert to attachment regression tests to check that number of objects in the scene graph 2012-07-06 23:07:50 +01:00
Melanie
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
UbitUmarov
909572ed86 fix SceneGraph Add/Remove PhysicalPrim counters 2012-06-21 09:40:51 +01:00
Justin Clark-Casey (justincc)
5c162ccd57 Go back to calling IncomingCloseAgent() in the "kick user" command for consistency instead of IClientAPI.Close() directly. 
This no longer double counts child agent removals
 2012-06-08 00:59:39 +01:00
Melanie
48add77a4c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-06-08 00:43:39 +01:00
Justin Clark-Casey (justincc)
d547bcf8d1 Remove duplicate update of user count in Scene.IncomingCloseAgent() 
This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
 2012-06-08 00:40:38 +01:00