Commit Graph

18052 Commits (368b10357827df138fde64e120750787608357f7)

Author SHA1 Message Date
SignpostMarv ad1b9bbba6 documentation (OnSceneObjectPartCopy) 2012-09-11 20:12:45 +01:00
SignpostMarv 97b8739c1d documentation (OnRemovePresence) 2012-09-11 20:12:45 +01:00
SignpostMarv 0760121eb9 documentation (OnNewPresence) 2012-09-11 20:12:44 +01:00
SignpostMarv 0a22e78f59 documentation (OnClientConnect) 2012-09-11 20:12:44 +01:00
SignpostMarv 5e51f16ceb documentation (OnBackup) 2012-09-11 20:12:44 +01:00
SignpostMarv fd8a7e64b9 documentation (OnTerrainTick) 2012-09-11 20:12:44 +01:00
SignpostMarv ed5f574356 documentation (OnTerrainTainted) 2012-09-11 20:12:44 +01:00
SignpostMarv 44349f742e documentation (OnClientMovement) 2012-09-11 20:12:43 +01:00
SignpostMarv e3993eefa5 Documenting some of the events on OpenSim.Region.Framework.Scenes.EventManager (OnFrame) 2012-09-11 20:12:43 +01:00
SignpostMarv 8db5d79f4b passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly error messages 2012-09-10 13:15:32 +01:00
BlueWall bf56b30024 Adjust namespce of FlotsamCache
Place FloatsamCache in the same namespace as our other core asset caches
2012-09-09 14:35:48 -04:00
BlueWall 141abf9f42 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-09-09 14:34:52 -04:00
BlueWall 3257634024 Merge branch 'master' of /home/opensim/lib/osgrid/opensim 2012-09-09 14:32:47 -04:00
BlueWall 93662eecb3 Adjust namespce of FlotsamCache
Place FloatsamCache in the same namespace as our other core asset caches
2012-09-09 14:30:59 -04:00
BlueWall 8321ecb7a2 Revert "Move addin information to CoreModulePlugin.addin.xml"
This reverts commit 2ec34580ce.

  Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278.
2012-09-09 13:50:44 -04:00
BlueWall c356c97b3d Revert "Move addin information to CoreModulePlugin.addin.xml"
This reverts commit 2ec34580ce.
2012-09-09 13:02:13 -04:00
BlueWall 83f6565049 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-09-09 09:53:48 -04:00
BlueWall 9d36f57c34 Merge branch 'master' of /home/opensim/var/repo/opensim 2012-09-09 09:52:00 -04: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
SignpostMarv e041f09750 refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3 2012-09-08 00:44:27 +01:00
Justin Clark-Casey (justincc) fa3edcf55c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-08 00:17:57 +01:00
SignpostMarv 874bde366a 4096 is used in various places as the maximum height of a region, refactoring to be a constant 2012-09-08 00:14:39 +01:00
Robert Adams d8df2d6bed BulletSim: update the DLLs and SOs 2012-09-07 16:05:34 -07:00
Robert Adams 126eae7100 BulletSim: Add Bullet body and shape to BSPhysObject and rename
'Body' to 'BSBody' for disambiguation when reading code.
Complete the API2 interface so nearly all methods on bullet
    classes are available to the managed code. The efficient
    single call simulation step is kept in place while all
    other creation/destruction/parameterization can be done
    in the managed code.
2012-09-07 16:05:28 -07:00
Robert Adams 3c097cb7a9 BulletSim: Add some comments (gasp) and log messages. 2012-09-07 16:05:22 -07:00
Robert Adams 189f51233e BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'. 2012-09-07 16:05:16 -07:00
Robert Adams 76dc29dc37 BulletSim: Modify collision flag calls to return the current flags.
Track current collision flags in BSPrim.
Add BulletSimAPI calls for saving and restoring rigidBodies using
    construction information structure.
2012-09-07 16:05:11 -07:00
SignpostMarv df3914c7cd renaming to markdown file 2012-09-08 00:02:27 +01:00
SignpostMarv 740eac192b multi-paragraph list item 2012-09-08 00:02:27 +01:00
SignpostMarv 783ecd01f4 headers 2012-09-08 00:02:26 +01:00
SignpostMarv a0e3e23aa9 removing redundant header; this is the building.txt file for opensim 2012-09-08 00:02:26 +01:00
SignpostMarv 1acee36822 code blocks 2012-09-08 00:02:26 +01:00
SignpostMarv ac90322f1b markdown-formatted link 2012-09-08 00:02:26 +01:00
SignpostMarv 2ca93cb144 renaming to markdown file 2012-09-08 00:02:26 +01:00
SignpostMarv 4e2805496c header syntax 2012-09-08 00:02:26 +01:00
SignpostMarv 46af3a3d92 casing 2012-09-08 00:02:26 +01:00
BlueWall 717b11856e Move addin attributes to RegionCombinerModule.addin.xml
Will help in automation of setting version info for addin dependencies.
2012-09-07 13:21:06 -04:00
BlueWall 23196b127a Move addin attributes to RegionCombinerModule.addin.xml
Will help in automation of setting version info for addin dependencies.
2012-09-07 12:54:12 -04:00
BlueWall cdac29549e Merge branch 'master' of /home/opensim/var/repo/opensim 2012-09-07 12:07:13 -04:00
BlueWall 0199abd625 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-07 11:43:22 -04:00
BlueWall 550f6c4ad2 Revert "Move addin information to RegionCombinerModule.addin.xml"
This reverts commit ab446bc692.
  Need to look into this
2012-09-07 11:41:47 -04:00
BlueWall c713c8585d Revert "Move addin information to RegionCombinerModule.addin.xml"
This reverts commit ab446bc692.
  Need to look into this
2012-09-07 11:39:30 -04:00
Diva Canto 2b506cffb1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-07 08:10:03 -07:00
Diva Canto 33469a0d2b Moved the new vars in Robust.HG.ini to the proper section. 2012-09-07 08:09:44 -07:00
BlueWall 1f18ce516f Move addin information to RegionCombinerModule.addin.xml
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
2012-09-07 11:07:19 -04:00
BlueWall ab446bc692 Move addin information to RegionCombinerModule.addin.xml
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
2012-09-07 11:04:00 -04:00
BlueWall 2ec34580ce Move addin information to CoreModulePlugin.addin.xml
Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
2012-09-07 10:18:00 -04:00
BlueWall c46ddba231 Move addin information to CoreModulePlugin.addin.xml
Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
2012-09-07 10:13:51 -04:00
BlueWall 28b4beead7 Merge branch 'integration' of /home/opensim/var/repo/opensim
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
2012-09-06 23:30:51 -04:00
Justin Clark-Casey (justincc) 288baaecaf Add warning chevrons around the GC.Collect added to Warp3DImageModule in commit 5eb2526
Manually calling GC.Collect() really shouldnt' be necessary and is generally regarded as a bad idea.
A GC should occur anyway pretty shortly afterwards.
However, can leave this in development code for now to see if it does actually make a significant difference rather than simply doing a GC a little earlier.
2012-09-07 00:46:24 +01:00