Melanie e2e839a0cd Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs

2013-05-24 01:11:49 +01:00

..

Animation

Merge branch 'master' into careminster

2013-01-19 02:38:04 +00:00

Scripting

Remove very long unused IScriptHost and NullScriptHost

2013-02-06 02:15:54 +00:00

Serialization

Merge branch 'master' into careminster

2013-02-08 23:29:47 +00:00

Tests

Merge branch 'master' into careminster

2013-05-11 02:35:26 +01:00

Types

…

AsyncInventorySender.cs

OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id

2012-06-12 02:43:33 +01:00

AsyncSceneObjectGroupDeleter.cs

Only send one kill object to the deleter when they derez an object rather than two.

2013-05-09 18:53:34 +01:00

Border.cs

Add "show borders" command to show the borders of a region.

2013-03-23 00:45:21 +00:00

Cardinals.cs

…

CoalescedSceneObjects.cs

…

CollisionSounds.cs

remove forgotten line...

2012-07-14 20:13:40 +01:00

EntityBase.cs

…

EntityManager.cs

Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the aim of avoiding OpenSimulator problems due to script thread aborts.

2012-12-07 00:47:04 +00:00

EventManager.cs

Merge branch 'master' into careminster

2013-02-15 21:42:16 +00:00

KeyframeMotion.cs

Make Keyframe motion cross regions again

2013-03-03 12:48:56 +01:00

Prioritizer.cs

Reverse a senseless change in the prioritizer. Why I would want avatars to render according to their camera position is beyond me.

2012-07-31 23:38:01 +02:00

RegionStatsHandler.cs

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00

ReturnInfo.cs

…

Scene.cs

Merge branch 'master' into careminster

2013-05-16 21:59:14 +01:00

Scene.Inventory.cs

Merge branch 'master' into careminster

2013-05-16 21:59:14 +01:00

Scene.PacketHandlers.cs

Merge branch 'master' into careminster

2012-10-26 21:13:01 +01:00

Scene.Permissions.cs

If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region.

2012-04-27 20:22:35 +01:00

SceneBase.cs

Merge branch 'master' into careminster

2013-05-04 01:22:12 +01:00

SceneCommunicationService.cs

On closing child agents, send separate asynchronous requests to each neighbour rather than sending all closes concurrently on a separate thread.

2013-05-16 17:12:02 +01:00

SceneGraph.cs

Plumb the path from the client to the extra physics params and back

2013-02-07 22:25:28 +00:00

SceneManager.cs

Fix SceneManager to use the new automatic property throughout.

2013-03-21 01:44:09 +01:00

SceneObjectGroup.cs

Merge branch 'master' into careminster

2013-05-24 01:11:49 +01:00

SceneObjectGroup.Inventory.cs

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

SceneObjectPart.cs

Merge branch 'master' into careminster

2013-05-24 01:11:49 +01:00

SceneObjectPartInventory.cs

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

ScenePresence.cs

Merge branch 'master' into careminster

2013-05-16 21:59:14 +01:00

SimStatsReporter.cs

Merge branch 'master' into careminster

2013-05-16 21:59:14 +01:00

SOPMaterial.cs

initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc

2012-03-13 17:56:32 +00:00

SOPVehicle.cs

missed fix on vehicle reference frame

2012-07-13 20:25:47 +01:00

TerrainChannel.cs

Terrain: added [Terrain] section with an option to load an initial flat terrain. Default is still pinhead island. I much rather have a flat land in the beginning.

2012-03-16 13:08:05 -07:00

TerrainUtil.cs

…

UndoState.cs

Refactor, move OjectChangeData into it's own file and rename

2012-03-13 13:08:32 +01:00

UuidGatherer.cs

Merge branch 'master' into careminster

2013-04-25 20:47:55 +01:00