Melanie 8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs

2011-10-11 21:28:23 +01:00

..

Animation

Resolve merge commits, stage 1

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

Scripting

…

Serialization

Resolve merge commits, stage 1

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

Tests

stop the duplicate remove of the root part ids from the full part and local part indexes in SG.DeleteSceneObject()

2011-09-13 18:11:13 +01: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 branch 'master' into careminster-presence-refactor

2011-04-21 16:28:29 +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

refactor: simplify EntityBase.IsDeleted property

2011-08-24 22:34:26 +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

…

ReturnInfo.cs

…

Scene.cs

Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

2011-10-11 21:28:23 +01:00

Scene.Inventory.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21: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 branch 'master' into careminster-presence-refactor

2011-02-07 22:08:53 +00:00

SceneGraph.cs

Bring us up to date.

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

SceneManager.cs

Merge branch 'master' into bulletsim

2011-08-19 14:49:16 -07:00

SceneObjectGroup.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

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

SceneObjectGroup.Inventory.cs

Bring us up to date.

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

SceneObjectPart.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

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

SceneObjectPartInventory.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

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

ScenePresence.cs

Fixed a movement regression - Kitto's jump code is no longer needed (plus it's an eyesore)

2011-09-14 19:34:03 -07:00

SceneViewer.cs

Bring us up to date.

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

SimStatsReporter.cs

Make SImStatsReporter pick ObjectCapacity striaght out of region info

2010-10-22 18:27:49 -04: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