Merged from OpenSceneGraph-2.6 branch

AUTHORS.txt

@@ -1,6 +1,6 @@
 OpenSceneGraph Library 2.6.0
 
-323 Contributors:
+324 Contributors:
 
 Firstname Surname
 -----------------
@@ -21,8 +21,8 @@ Ulrich Hertlein
 Martin Lavery
 David Callu
 Tree 
-Luigi Calori
 Jean-Sebastien Guay
+Luigi Calori
 Trajce Nikolov
 Mike Wittman
 Pavel Moloshtan
@@ -42,17 +42,17 @@ Olaf Flebbe
 Gideon May
 Don Tidrow
 Romano José Magacho da Silva
+Philip Lowman
 Paul Melis
 Michael Platings
 Michael Gronager
 Daniel Sjölie
 Chris Hanson
 Adrian Egli
+Sherman Wilcox
 Per Fahlberg
 J.P. Delport
 David Spilling
-Sherman Wilcox
-Philip Lowman
 Melchior Franz
 Joran Jessurun
 Joakim Simonsson
@@ -69,6 +69,7 @@ Rune Schmidt Jensen
 Rainer Oder
 Mike Connell
 Mathieu Marache
+Glenn Waldron
 Carlo Camporesi
 Ben Discoe
 Andreas Ekstrand
@@ -97,7 +98,6 @@ Mihai Radu
 Michael Hartman
 Luc Frauciel
 Laurens Voerman
-Glenn Waldron
 David Guthrie
 Corbin Holtz
 Cedric Pinson
@@ -298,6 +298,7 @@ Dean Iverson
 David Jung
 David Gurhrie
 Daniel Stien
+Daniel Olivier
 Dan Minor
 Cyril Brulebois
 Clay Fowler

NEWS.txt

@@ -16,22 +16,26 @@ The !OpenSceneGraph 2.6 release is the culmination of 9 years of work by the lea
     * OpenGL Multi-sample FrameBufferObject support.
     * New osg::ImageSequence class for doing texture animation of a series of image files.
     * New database optimizer that is able to remove static transforms by duplicating shared geometries.
-    * Use glGenerateMipmap to speed up mipmap generation in now power of two textures.
+    * Use glGenerateMipmap to speed up mipmap generation in non power-of-two textures.
     * New osgViewer::ScreenCaptureHandler for adding screen shot support to osgViewer applications.
     * New osgscreencapture example that demonstrates use of double buffer PixelBufferObject's for streaming of imagery from the screen.
-    * New utility application osgfilecache which can be used to populate the local cache for given lat/long ranges and levels.
+    * New utility application osgfilecache which can be used to populate the local cache for given lat/lon ranges and levels.
-    * Rewritten DatabasePager that now supports multiple database reading threads, including handling of http request via a separate reading threads that vastly improves the speed of updates when handling http hosted databases that have already partially been downloaded to local file cache.
+    * Rewritten DatabasePager that now supports multiple database reading threads. This includes handling of HTTP requests via a separate reading thread, vastly improving the speed of updates when handling HTTP hosted databases that have already partially been downloaded to local file cache.
-    * Support for a file cache for locally caching paged database hosted over http.
+    * Support for a file cache for locally caching paged databases hosted over HTTP.
+    * Support for http authentication in osgDB and the libcurl plugin
     * New osgconv --format <fmt>, --formats and --plugins command line options for listing available plugins and the file formats/options they support.
     * Performance improvements in handling TerraPage.
     * Animated GIF support.
     * New SVG image loader.
-    * Improvements to the .obj loader to support are wider range of .obj files and material properties.
+    * Improvements to the .obj loader to support a wider range of .obj files and material properties.
+    * Support for thread safe Atomic reference counting.
     * Support for COLLADA DOM 2.x
     * Support for Philips WOWvx 3D auto-stereoscopic displays
+    * New include/osg/Config and include/OpenThreads/Config configuration files, that are automatically generated by CMake, which make more straight forward to build end users applications against OpenSceneGraph versions built with non default build options.
     * Support for CMake 2.6
     * A wide range of build and bug fixes 
 
+ 
 === Downloads and Licensing ===
 !OpenSceneGraph is open-source so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/projects/osg/wiki/Downloads Downloads] section of the openscenegraph.org website.
 
@@ -52,7 +56,7 @@ The !OpenSceneGraph Quick Start Guide is now available in Chinese as well as Eng
 === Community support and contributions ===
 The diverse and growing community of over 1900 developers is centred around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists. 
 
-The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointFour 323 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
+The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointSix 324 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
 
 ----
 

applications/osgversion/osgversion.cpp

@@ -219,6 +219,8 @@ bool validName(const std::string& first)
     if (first=="LightPointNode") return false;
     if (first=="GeometryTechnique") return false;
     if (first=="GeoemtryTechnique") return false;
+    if (first=="KdTree") return false;
+    if (first=="LineSegment") return false;
     return true;
 }