Melanie a9af618842 Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2011-10-11 23:32:16 +01:00
..
ApplicationPlugins	Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge	2011-10-11 23:15:29 +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 '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge	2011-10-11 23:21:36 +01:00
Region	Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge	2011-10-11 23:32:16 +01:00
Server	Resolve merge commits, stage 1	2011-09-04 07:06:36 -07:00
Services	Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge	2011-10-11 22:51:44 +01:00
TestSuite	* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll	2009-10-30 00:08:41 -07:00
Tests	Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge	2011-10-11 22:42:18 +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