Melanie 2ca80add14 Merge branch 'master' into careminster ...

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

2012-01-25 15:24:25 +00:00

..

Animation

Add method doc to SPA.Falling and use automatic private get property

2012-01-07 00:29:55 +00:00

Scripting

…

Serialization

HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.

2012-01-12 09:56:35 -08:00

Tests

Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding

2011-12-12 02:43:38 -08: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

Make the AsyncSceneObjectDeleter send a list of kills. This will make large

2011-11-06 20:43:49 +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-01-05 08:15:33 +00: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

Add handling bans properly

2012-01-24 03:14:00 +01:00

Scene.Inventory.cs

If dragging a script that is no copy from prim inventory into agent

2012-01-06 17:43:35 +00:00

Scene.PacketHandlers.cs

Merge branch 'master' into careminster

2011-12-19 23:16:20 +00:00

Scene.Permissions.cs

Remove ViewObjectInventory method unsupported by core

2012-01-12 01:11:05 +01:00

SceneBase.cs

Merge branch 'master' into careminster

2011-12-10 00:40:41 +00:00

SceneCommunicationService.cs

Changed the async approach on close child agents. This may improve crossings a little bit.

2011-12-16 17:24:50 -08:00

SceneGraph.cs

Merge branch 'master' into careminster

2012-01-25 15:24:25 +00:00

SceneManager.cs

Comment debug spam

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

SceneObjectGroup.cs

Cleaned up the LookAt code in SOP and SOG. Added support for incrementally

2012-01-13 14:48:56 -08:00

SceneObjectGroup.Inventory.cs

Fix taking or returning locked objects losing permissions for owner

2011-11-12 12:09:28 +01:00

SceneObjectPart.cs

Merge branch 'master' into careminster

2012-01-14 06:09:19 +00:00

SceneObjectPartInventory.cs

Merge branch 'master' into bigmerge

2011-11-28 11:06:38 +00:00

ScenePresence.cs

Teleport routing, part 1

2012-01-24 04:06:37 +00:00

SimStatsReporter.cs

Tie reported FPS correction factor into the minimum frame time rather than setting separately.

2011-10-13 22:07:55 +01:00

TerrainChannel.cs

…

TerrainUtil.cs

…

UndoState.cs

Merge branch 'master' into bigmerge

2011-11-03 00:06:14 +00:00

UuidGatherer.cs

Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge

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