Melanie 353f0c0e03 Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs		2011-10-25 02:14:39 +01:00
..
ApplicationPlugins	Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge	2011-10-12 07:23:02 +01:00
Capabilities	Save the default terrain texture UUIDs for a new region instead of leaving them as UUID.Zero.	2011-09-09 00:38:04 +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 commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge	2011-10-11 22:26:18 +01:00
Framework	Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge	2011-10-25 02:14:39 +01:00
Region	Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge	2011-10-25 02:14:39 +01:00
Server	Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge	2011-10-25 01:37:11 +01:00
Services	Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge	2011-10-25 01:51:37 +01:00
TestSuite	* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll	2009-10-30 00:08:41 -07:00
Tests	Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge	2011-10-25 02:14:39 +01:00
Tools	Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.	2011-09-24 01:59:02 +01:00