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

..

Animation

Merge branch 'master' into careminster

2013-06-13 02:49:43 +01:00

Scripting

Remove very long unused IScriptHost and NullScriptHost

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

Serialization

Merge branch 'master' into careminster

2013-06-30 18:27:30 +01:00

Tests

Merge branch 'master' into careminster

2013-08-17 03:23:45 +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

Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId!

2011-11-16 23:01:59 +00:00

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-07-24 04:45:07 +01:00

KeyframeMotion.cs

minor: remove mono compiler warnings related to keyframe code

2013-07-08 23:52:40 +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

Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap

2013-07-08 22:03:07 +01:00

ReturnInfo.cs

…

Scene.cs

Merge branch 'master' into careminster

2013-09-01 22:49:31 +01:00

Scene.Inventory.cs

Merge branch 'master' into careminster

2013-08-18 03:00:32 +01:00

Scene.PacketHandlers.cs

Merge branch 'master' into careminster

2013-07-24 04:45:07 +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-08-14 21:25:22 +01:00

SceneCommunicationService.cs

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

SceneGraph.cs

Merge branch 'master' into careminster

2013-09-01 22:49:31 +01:00

SceneManager.cs

Merge branch 'master' into careminster

2013-07-04 22:32:58 +01:00

SceneObjectGroup.cs

Merge branch 'master' into careminster

2013-06-30 18:27:30 +01:00

SceneObjectGroup.Inventory.cs

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

SceneObjectPart.cs

Merge branch 'master' into careminster

2013-09-01 22:49:31 +01:00

SceneObjectPartInventory.cs

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

ScenePresence.cs

Merge branch 'master' into careminster

2013-09-01 22:49:31 +01:00

ScenePresenceStateMachine.cs

Add missing file from b1c26a56

2013-08-09 17:57:24 +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

Guard against trying to access terrain heights out of bounds. Clamp to sim.

2013-05-11 16:16:02 +02: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-06-30 18:27:30 +01:00