Melanie 90305001de Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

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

..

AgentCircuitDataTest.cs

Get rid of AvatarAppearance.Owner to simplify the code.

2011-08-02 00:13:04 +01:00

AgentCircuitManagerTests.cs

Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()

2011-12-03 18:59:54 +00:00

AnimationTests.cs

Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()

2011-12-03 18:59:54 +00:00

AssetBaseTest.cs

Changed asset CreatorID to a string

2010-02-22 14:18:59 -08:00

CacheTests.cs

* Fixed and re-enabled CacheTests

2010-09-17 18:41:12 -04:00

LocationTest.cs

* Tweaked the LocationTests for maximum coverage.

2010-09-18 03:42:37 -04:00

MundaneFrameworkTests.cs

Merge branch 'master' into careminster

2012-04-17 01:54:54 +01:00

PrimeNumberHelperTests.cs

Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.

2011-03-09 23:25:24 +00:00

UtilTest.cs

Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.

2012-04-26 22:49:14 +01:00