[osg-submissions] Fix to StateSet::merge

[Mario Guimaraes]

Hi Robert,

Currently, in the StateSet::merge method, the rhs state attributes and
modes are not merged into the lhs state when the rhs is PROTECTED. The
changes I'm providing here address this problem.

Thanks,
Mario.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: StateSet.cpp
Type: application/octet-stream
Size: 60852 bytes
Desc: not available
Url : http://lists.openscenegraph.org/pipermail/osg-submissions-openscenegraph.org/attachments/20071112/a34fa90d/attachment-0001.obj