Melanie 6101de2316 Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge ... Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-10-11 22:32:10 +01:00
..
ApplicationPlugins	Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge	2011-10-11 21:30:42 +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	…
Data	Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge	2011-10-11 22:26:18 +01:00
Framework	Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge	2011-10-11 21:41:30 +01:00
Region	Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge	2011-10-11 22:32:10 +01:00
Server	Resolve merge commits, stage 1	2011-09-04 07:06:36 -07:00
Services	Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge	2011-10-11 21:30:42 +01:00
TestSuite	…
Tests	Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge	2011-10-11 22:32:10 +01:00
Tools	Make default serverside_object_permissions = true since this better matches user expectations.	2011-07-01 23:06:46 +01:00