Dan Lake 9556e0079b Merge branch 'master' into dev ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs		2011-05-05 14:24:27 -07:00
..
ApplicationPlugins	Mantis #5442: Add admin_save_heightmap	2011-04-17 21:43:16 +01:00
Capabilities	Squish a warning	2011-05-05 13:01:46 +01: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-04-28 16:31:40 -07:00
Framework	Merge branch 'master' into dev	2011-05-05 14:24:27 -07:00
Region	Merge branch 'master' into dev	2011-05-05 14:24:27 -07:00
Server	Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.	2011-04-28 20:19:54 -07:00
Services	Merge branch 'master' into dev	2011-05-05 14:24:27 -07:00
TestSuite	* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll	2009-10-30 00:08:41 -07:00
Tests	Merge branch 'master' into dev	2011-05-05 14:24:27 -07:00
Tools	Merge branch 'master' into danmerge	2010-11-30 17:36:36 -08:00