Melanie aee7a31bc3 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2012-08-18 13:17:39 +01:00

..

Animation

Merge branch 'master' into careminster

2012-07-20 09:31:06 +01:00

Scripting

…

Serialization

Change attachment handling to remove object from the scene first as per

2012-07-23 21:39:26 +01:00

Tests

Add TestCreateDuplicateRootScenePresence() regression test.

2012-07-19 21:54:50 +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

Fix bug where an avatar that had an object they owned attached through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene.

2012-05-23 01:58:10 +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

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

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

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

EventManager.cs

Add support for the extra params to scene and the event manager

2012-08-15 18:58:39 +01:00

KeyframeMotion.cs

Revert "Add a frame based watchdog function to keyframed motion"

2012-06-08 16:54:47 +02: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

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00

ReturnInfo.cs

…

Scene.cs

Merge branch 'master' into careminster

2012-08-18 13:17:39 +01:00

Scene.Inventory.cs

Merge branch 'master' into careminster

2012-08-03 16:46:11 +01:00

Scene.PacketHandlers.cs

Revert "Mantis 5977 Corrections to llRegionSayTo"

2012-06-28 22:02:20 +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

2012-07-28 00:39:36 +01:00

SceneCommunicationService.cs

Fix an exception while outputting a log message

2012-07-29 15:12:03 +02:00

SceneGraph.cs

Merge branch 'master' into careminster

2012-08-18 13:17:39 +01:00

SceneManager.cs

Fix some merge issues and a functional issue in the scene manager

2012-07-28 01:06:28 +01:00

SceneObjectGroup.cs

Merge branch 'master' into careminster

2012-08-18 13:17:39 +01:00

SceneObjectGroup.Inventory.cs

Merge branch 'master' into careminster

2012-07-11 03:56:50 +01:00

SceneObjectPart.cs

Merge branch 'master' into careminster

2012-08-18 13:17:39 +01:00

SceneObjectPartInventory.cs

Fix merge artefacts

2012-07-17 01:42:42 +02:00

ScenePresence.cs

Merge branch 'master' into careminster

2012-08-18 13:17:39 +01:00

SimStatsReporter.cs

Merge branch 'master' into careminster

2012-07-28 00:39:36 +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

Terrain: added [Terrain] section with an option to load an initial flat terrain. Default is still pinhead island. I much rather have a flat land in the beginning.

2012-03-16 13:08:05 -07: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 commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge

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