Make rviz work with Ogre 1.10

This updates Rviz so it will compile against Ogre version 1.10 as well as Ogre version 1.7.4.
(Presumably also intermediate versions but that was not tested)