lcc 7ecd9b3f1a Merge branch 'master' of ssh://3dhosting.de/var/git/careminster ... resolved Conflicts: OpenSim/Region/Framework/Interfaces/ISnmpModule.cs		2010-04-10 23:52:10 +02:00
..
ApplicationPlugins	Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then.	2010-04-05 22:08:34 +02:00
Client	Merge branch '0.6.9-post-fixes' into careminster	2010-03-06 12:24:09 +00:00
ConsoleClient	Apply http://opensimulator.org/mantis/view.php?id=4504	2010-01-29 23:38:44 +00:00
Data	Merge branch '0.6.9-post-fixes' into careminster	2010-03-06 12:24:09 +00:00
Framework	Test commit	2010-04-05 22:31:30 +02:00
Grid	Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522	2010-02-12 23:13:35 +00:00
Region	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster	2010-04-10 23:52:10 +02:00
Server	Fix a few compiler warnings.	2010-03-01 23:04:45 +09:00
Services	Formatting cleanup.	2010-02-15 19:21:56 +09:00
TestSuite	* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll	2009-10-30 00:08:41 -07:00
Tests	Merge branch '0.6.9-post-fixes' into careminster	2010-03-06 12:24:09 +00:00
Tools	Add license header and change branded namespace to generic	2010-02-08 22:50:59 +00:00