Melanie 96409cc2ee Merge branch 'ubitwork' ...

Conflicts:
	OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
	OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs

2012-02-19 20:08:01 +01:00

..

Animation

Add method doc to SPA.Falling and use automatic private get property

2012-01-07 00:29:55 +00:00

Scripting

…

Serialization

Merge branch 'master' into careminster

2012-02-18 22:21:10 +00:00

Tests

In ObjectTortureTests, run garbage collector on Teardown and run scene loop update when scene objects have been deleted.

2012-02-15 01:45:25 +00:00

Types

remove unused BasicQuadTreeNode

2010-07-30 21:06:45 +01:00

AsyncInventorySender.cs

minor: remove mono compiler warning

2011-07-11 02:11:37 +01:00

AsyncSceneObjectGroupDeleter.cs

Fix bug where somebody taking a copy of an object they didn't own that was rezzed before the region was restarted would wrongly place the copy in the object owner's inventory.

2012-02-10 19:58:34 +00:00

Border.cs

…

Cardinals.cs

…

CoalescedSceneObjects.cs

refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer.

2011-04-13 21:48:16 +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

Call public ForEach instead of using m_entities directly. No semantic changes, just cleanup

2011-11-16 02:33:56 -08:00

EventManager.cs

Merge branch 'master' into careminster

2012-02-18 22:21:10 +00:00

Prioritizer.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

RegionStatsHandler.cs

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

ReturnInfo.cs

…

Scene.cs

Merge branch 'ubitwork'

2012-02-19 20:08:01 +01:00

Scene.Inventory.cs

Merge branch 'master' into careminster

2012-02-18 22:21:10 +00:00

Scene.PacketHandlers.cs

Merge branch 'master' into careminster

2011-12-19 23:16:20 +00:00

Scene.Permissions.cs

Remove ViewObjectInventory method unsupported by core

2012-01-12 01:11:05 +01:00

SceneBase.cs

Merge branch 'master' into careminster

2011-12-10 00:40:41 +00:00

SceneCommunicationService.cs

Changed the async approach on close child agents. This may improve crossings a little bit.

2011-12-16 17:24:50 -08:00

SceneGraph.cs

Merge branch 'master' into careminster

2012-02-18 22:21:10 +00:00

SceneManager.cs

Comment debug spam

2011-12-13 00:36:44 +01:00

SceneObjectGroup.cs

Merge branch 'ubitwork'

2012-02-19 20:08:01 +01:00

SceneObjectGroup.Inventory.cs

Merge branch 'master' into careminster

2012-02-10 10:20:51 +00:00

SceneObjectPart.cs

Merge branch 'ubitwork'

2012-02-19 20:08:01 +01:00

SceneObjectPartInventory.cs

Merge branch 'master' into careminster

2012-02-07 21:09:04 +00:00

ScenePresence.cs

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

2012-02-15 03:51:30 +00:00

SimStatsReporter.cs

Tie reported FPS correction factor into the minimum frame time rather than setting separately.

2011-10-13 22:07:55 +01:00

SOPVehicle.cs

moved vehicle from SOG to SOP

2012-02-19 13:21:01 +00:00

TerrainChannel.cs

…

TerrainUtil.cs

…

UndoState.cs

Merge branch 'master' into bigmerge

2011-11-03 00:06:14 +00:00

UuidGatherer.cs

Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge

2011-10-25 03:19:55 +01:00