Melanie 50321fb7bf Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

2012-05-09 00:43:33 +01:00

..

Animation

*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);

2012-05-04 19:19:54 +01: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 regression test for teleporting between neighbouring regions on the same simulator

2012-05-01 23:14:12 +01:00

Types

…

AsyncInventorySender.cs

minor: remove mono compiler warning

2011-07-11 02:11:37 +01:00

AsyncSceneObjectGroupDeleter.cs

Comment out debug [ASYNC DELETER] messages for now.

2012-04-28 00:39:40 +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

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-05-09 00:43:33 +01: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 optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +01:00

ReturnInfo.cs

…

Scene.cs

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00

Scene.Inventory.cs

Add a configuration switch to turn on/off the use of the trash

2012-04-25 11:54:57 -07:00

Scene.PacketHandlers.cs

Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

2012-04-23 21:13:08 +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-03-20 23:39:02 +00:00

SceneCommunicationService.cs

Merge branch 'master' into careminster

2012-04-09 21:40:03 +01:00

SceneGraph.cs

Merge branch 'master' into careminster

2012-05-09 00:43:33 +01:00

SceneManager.cs

Comment debug spam

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

SceneObjectGroup.cs

Merge branch 'master' into careminster

2012-05-07 12:07:47 +01:00

SceneObjectGroup.Inventory.cs

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

SceneObjectPart.cs

Merge branch 'master' into careminster

2012-05-09 00:43:33 +01:00

SceneObjectPartInventory.cs

Merge branch 'master' into careminster

2012-05-05 10:32:04 +01:00

ScenePresence.cs

Merge branch 'master' into careminster

2012-05-09 00:43:33 +01:00

SimStatsReporter.cs

"save the catgirls"

2012-04-24 05:42:47 +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

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