Melanie 771d79e83e Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml		2012-07-28 00:39:36 +01:00
..
Caps	Merge branch 'master' into careminster	2012-03-08 19:10:22 +00:00
EntityTransfer	Merge branch 'master' into careminster	2012-06-28 03:21:08 +01:00
InterfaceCommander	Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522	2010-02-12 23:13:35 +00:00
InventoryAccess	Merge branch 'master' into careminster	2012-07-28 00:39:36 +01:00
Library	For default everyone permissions on library items, make notecards and scripts non-modifiable (but still copyable, etc).	2011-07-23 02:18:23 +01:00
Monitoring	Add last frame time monitor to MonitorModule now that this value is useful	2012-06-11 23:30:11 +01:00
Statistics/Logging	BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempting to fix a mono compile error.	2012-07-20 15:34:19 -07:00
UserManagement	Add "friends show cache <first-name> <last-name>" command for debugging purposes.	2012-03-28 02:51:34 +01:00