From 284d7c911dbb1e330f48522eb4229dde8843960c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 24 Oct 2008 09:59:12 +0000
Subject: [PATCH] Add osgParticle:: qualifiers in front of Program entries to
 avoid issues when combining osg::Program and osgParticle::Program in a single
 app

---
 src/osgPlugins/osgParticle/IO_FluidProgram.cpp   | 2 +-
 src/osgPlugins/osgParticle/IO_ModularProgram.cpp | 2 +-
 src/osgPlugins/osgParticle/IO_Program.cpp        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/osgParticle/IO_FluidProgram.cpp b/src/osgPlugins/osgParticle/IO_FluidProgram.cpp
index 473156515..9deda848b 100644
--- a/src/osgPlugins/osgParticle/IO_FluidProgram.cpp
+++ b/src/osgPlugins/osgParticle/IO_FluidProgram.cpp
@@ -18,7 +18,7 @@ osgDB::RegisterDotOsgWrapperProxy  FluidProgram_Proxy
 (
     new osgParticle::FluidProgram,
     "FluidProgram",
-    "Object Node ParticleProcessor Program FluidProgram",
+    "Object Node ParticleProcessor osgParticle::Program FluidProgram",
     FluidProgram_readLocalData,
     FluidProgram_writeLocalData
 );
diff --git a/src/osgPlugins/osgParticle/IO_ModularProgram.cpp b/src/osgPlugins/osgParticle/IO_ModularProgram.cpp
index a23c81d13..43e727eb1 100644
--- a/src/osgPlugins/osgParticle/IO_ModularProgram.cpp
+++ b/src/osgPlugins/osgParticle/IO_ModularProgram.cpp
@@ -15,7 +15,7 @@ osgDB::RegisterDotOsgWrapperProxy  ModularProgram_Proxy
 (
     new osgParticle::ModularProgram,
     "ModularProgram",
-    "Object Node ParticleProcessor Program ModularProgram",
+    "Object Node ParticleProcessor osgParticle::Program ModularProgram",
     ModularProgram_readLocalData,
     ModularProgram_writeLocalData
 );
diff --git a/src/osgPlugins/osgParticle/IO_Program.cpp b/src/osgPlugins/osgParticle/IO_Program.cpp
index f60afa788..543fd1151 100644
--- a/src/osgPlugins/osgParticle/IO_Program.cpp
+++ b/src/osgPlugins/osgParticle/IO_Program.cpp
@@ -11,8 +11,8 @@ bool  IOProgram_writeLocalData(const osg::Object &obj, osgDB::Output &fw);
 osgDB::RegisterDotOsgWrapperProxy  g_IOProgramProxy
 (
     0,
-    "Program",
-    "Object Node ParticleProcessor Program",
+    "osgParicle::Program",
+    "Object Node ParticleProcessor osgParicle::Program",
     IOProgram_readLocalData,
     IOProgram_writeLocalData
 );