Dan Lake 3e74a72d2e Merge branch 'master' into dev ... Conflicts: OpenSim/Client/MXP/ClientStack/MXPClientView.cs OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-04-28 16:31:40 -07:00
..
Application	Merge branch 'master' into dev	2011-04-19 11:52:25 -07:00
ClientStack	Merge branch 'master' into dev	2011-04-28 16:31:40 -07:00
CoreModules	Merge branch 'master' into dev	2011-04-28 16:31:40 -07:00
DataSnapshot	First pass at cleaning up thread safety in EntityManager and SceneGraph	2010-09-10 12:04:12 -07:00
Examples/SimpleModule	Merge branch 'master' into dev	2011-04-19 11:52:25 -07:00
Framework	Merge branch 'master' into dev	2011-04-28 16:31:40 -07:00
OptionalModules	Merge branch 'master' into dev	2011-04-28 16:31:40 -07:00
Physics	Merge branch 'master' into dev	2011-04-28 16:31:40 -07:00
RegionCombinerModule	remove now unused individual LandData prim counts.	2011-04-05 21:25:54 +01:00
ReplaceableModules	Some module reshuffling, no user functionality yet	2009-07-10 20:46:16 +00:00
ScriptEngine	Merge branch 'master' into dev	2011-04-19 11:52:25 -07:00
UserStatistics	Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).	2010-03-19 15:16:35 -07:00