Melanie 9a67baae21 Merge branch 'master' into careminster ...

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

2012-03-23 14:24:55 +00:00

..

Animation

Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e

2012-03-23 01:08:13 +00:00

Scripting

…

Serialization

bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still

2012-03-14 18:24:04 +00:00

Tests

Add llGiveInventory() test from object to object where both objects are owned by the same user.

2012-03-22 22:17:07 +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-03-20 02:48:11 +00:00

KeyframeMotion.cs

Make llSetKeyframedMotion prims waut at the borders of down sims and try again

2012-02-26 21:16:24 +01: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 'master' into careminster

2012-03-23 14:24:55 +00:00

Scene.Inventory.cs

Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

2012-03-22 23:05:58 +00:00

Scene.PacketHandlers.cs

Merge branch 'master' into careminster

2012-03-18 20:44:56 +00:00

Scene.Permissions.cs

Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."

2012-03-22 20:10:38 +00:00

SceneBase.cs

Merge branch 'master' into careminster

2012-03-20 23:39:02 +00:00

SceneCommunicationService.cs

Merge branch 'master' into careminster

2012-02-24 09:56:06 +00:00

SceneGraph.cs

add some more notifications about changes on physical parameters ( still incomple and there should be a better away )

2012-03-20 16:46:16 +00:00

SceneManager.cs

Comment debug spam

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

SceneObjectGroup.cs

Merge branch 'ubitwork'

2012-03-19 14:25:11 +01:00

SceneObjectGroup.Inventory.cs

Merge branch 'master' into careminster

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

SceneObjectPart.cs

fix a bad reset of shapetype on pbshape change, added missing checksculpload ( to reload mesh on change )

2012-03-21 15:27:33 +00:00

SceneObjectPartInventory.cs

Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

2012-03-22 23:05:58 +00:00

ScenePresence.cs

Make anims way more snappy. Decouple SP animation handling from physics frame

2012-03-23 03:16:07 +01:00

SimStatsReporter.cs

Remove unnecessary explicit ElapsedEventHandler in SimReporter

2012-03-06 22:31:25 +00: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

simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs

2012-02-19 19:27:01 +00: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