Melanie facdc9c46e Merge branch 'master' into bigmerge ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-11-05 22:56:08 +00:00
..
ApplicationPlugins	Merge branch 'master' into bigmerge	2011-11-04 01:18:37 +00: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 OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.	2011-10-25 20:24:21 +01:00
Data	Merge branch 'master' into bigmerge	2011-11-03 00:06:14 +00:00
Framework	Merge branch 'master' into bigmerge	2011-11-05 11:17:40 +00:00
Region	Merge branch 'master' into bigmerge	2011-11-05 22:56:08 +00:00
Server	Merge branch 'master' into bigmerge	2011-11-03 00:06:14 +00:00
Services	Merge branch 'master' into bigmerge	2011-11-05 11:17:40 +00:00
Tests	Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge	2011-10-25 03:19:10 +01:00
Tools	remove the pointless check of the face texture struct against null in Bot.Objects_NewPrim()	2011-11-03 22:52:14 +00:00