Melanie 83ec064868 Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2011-10-11 22:53:27 +01:00

..

Animation

Resolve merge commits, stage 1

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

Scripting

Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon

2009-10-15 16:35:27 -07:00

Serialization

Resolve merge commits, stage 1

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

Tests

Reinstate option to land an npc when it reaches a target.

2011-09-22 00:16:05 +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

Formatting cleanup.

2009-10-01 09:38:36 +09:00

Cardinals.cs

Add copyright headers. Formatting cleanup.

2009-09-03 02:04:17 +09:00

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 setter from SP.OffsetPosition, since all sets should flow through SP.AbsolutePosition

2011-09-16 22:51:36 +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

OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.

2010-01-11 07:51:33 -08:00

ReturnInfo.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

Scene.cs

Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

2011-10-11 22:42:18 +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 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 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

2011-10-11 22:42:18 +01:00

SceneObjectGroup.Inventory.cs

Bring us up to date.

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

SceneObjectPart.cs

Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge

2011-10-11 22:53:27 +01:00

SceneObjectPartInventory.cs

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

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

ScenePresence.cs

Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge

2011-10-11 22:42:51 +01: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

* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)

2009-10-02 18:31:08 -07:00

TerrainUtil.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

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