Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metricsPhase2

Fixed conflicts.

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -64,6 +64,8 @@ namespace OpenSim.Region.Framework.Scenes
         
         public const int m_defaultNumberFramesStored = 10;
 
+        public const int m_defaultNumberFramesStored = 10;
+        
         public delegate void SynchronizeSceneHandler(Scene scene);
 
         #region Fields