Melanie 0cbba1da8d Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge

2011-10-25 02:54:41 +01:00

..

Animation

Fix ground sit autopilot

2011-10-25 00:53:39 +02:00

Scripting

…

Serialization

Resolve merge commits, stage 1

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

Tests

Fixed line endings from previous commit

2011-10-06 23:20:51 -07: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

Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge

2011-10-11 23:08:18 +01: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

remove some mono compiler warnings

2011-10-12 21:54:25 +01:00

EntityManager.cs

remove mono compiler warnings

2010-12-17 22:35:08 +00:00

EventManager.cs

Resolve merge commits, stage 1

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

Prioritizer.cs

Resolve merge commits, stage 1

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

RegionStatsHandler.cs

remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms.

2011-10-07 00:30:35 +01:00

ReturnInfo.cs

…

Scene.cs

Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge

2011-10-25 02:15:01 +01:00

Scene.Inventory.cs

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

Scene.PacketHandlers.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

Scene.Permissions.cs

Add a new ViewObjectInventory permission to decouple viewing from

2011-01-14 18:26:41 +01:00

SceneBase.cs

Resolve merge commits, stage 1

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

SceneCommunicationService.cs

Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge

2011-10-12 07:05:18 +01:00

SceneGraph.cs

Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge

2011-10-12 01:42:39 +01:00

SceneManager.cs

Allow an avatar to be explicitly named to the "debug packet" command

2011-10-17 20:58:23 +01:00

SceneObjectGroup.cs

Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge

2011-10-25 02:26:56 +01:00

SceneObjectGroup.Inventory.cs

Bring us up to date.

2011-09-14 19:11:32 -07:00

SceneObjectPart.cs

Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge

2011-10-25 02:35:33 +01:00

SceneObjectPartInventory.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

ScenePresence.cs

Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge

2011-10-25 02:35:33 +01:00

SceneViewer.cs

Bring us up to date.

2011-09-14 19:11:32 -07: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

TerrainChannel.cs

…

TerrainUtil.cs

…

UndoState.cs

Merge fixes, and fix the build

2011-09-14 18:46:42 -07:00

UuidGatherer.cs

Bring us up to date.

2011-09-14 19:11:32 -07:00