Dan Lake 7447765f4d Merge branch 'master' into dev ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/Physics/OdePlugin/OdePlugin.cs		2011-07-15 15:32:42 -07:00
..
ApplicationPlugins	Add profile, merge, noassets and skip-assets options for loading/saving oars via RemoteAdmin	2011-07-02 01:05:03 +01:00
Capabilities	Comment verbose debug message in GetTexture	2011-05-08 16:50:36 -07:00
ConsoleClient	Make the text mode remote console really work. It can now be used to send	2010-06-08 22:05:06 +01:00
Data	Merge branch 'master' into dev	2011-06-14 23:16:48 -07:00
Framework	Merge branch 'master' into dev	2011-07-15 15:32:42 -07:00
Region	Merge branch 'master' into dev	2011-07-15 15:32:42 -07:00
Server	V2 map now working in grids too. WARNING: A few visible configuration variables added in order for this to work. See .ini.example changes	2011-06-13 09:13:44 -07:00
Services	Merge branch 'master' into dev	2011-07-15 15:32:42 -07:00
TestSuite	…
Tests	Merge branch 'master' into dev	2011-07-15 15:32:42 -07:00
Tools	Merge branch 'master' into dev	2011-07-15 15:32:42 -07:00