[Personalrobots-commit] SF.net SVN: personalrobots:[16384] pkg/trunk

[<hsu...@us...>]

Revision: 16384
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=16384&view=rev
Author:   hsujohnhsu
Date:     2009-05-29 19:34:22 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Merging from branch:
svn merge -r 15796:15820 https://personalrobots.svn.sf.net/svnroot/personalrobots/pkg/branches/gazebo-branch-merge .

Modified Paths:
--------------
    pkg/trunk/visualization/rviz/src/rviz/robot/robot_link.cpp

Property Changed:
----------------
    pkg/trunk/
    pkg/trunk/robot_descriptions/gazebo_robot_description/Media/
    pkg/trunk/visualization/
    pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
    pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
    pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
    pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
    pkg/trunk/visualization_core/ogre_tools/
    pkg/trunk/visualization_core/ogre_tools/media/
    pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh/
    pkg/trunk/visualization_core/ogre_tools/test/


Property changes on: pkg/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge:15739-15794
   + /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820


Property changes on: pkg/trunk/robot_descriptions/gazebo_robot_description/Media
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820


Property changes on: pkg/trunk/visualization
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization:15739-15794
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
   + /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428


Property changes on: pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189


Property changes on: pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667


Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654


Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654

Modified: pkg/trunk/visualization/rviz/src/rviz/robot/robot_link.cpp
===================================================================
--- pkg/trunk/visualization/rviz/src/rviz/robot/robot_link.cpp	2009-05-29 19:25:37 UTC (rev 16383)
+++ pkg/trunk/visualization/rviz/src/rviz/robot/robot_link.cpp	2009-05-29 19:34:22 UTC (rev 16384)
@@ -293,7 +293,7 @@
     Ogre::MaterialPtr material = Ogre::MaterialManager::getSingleton().getByName(material_name);
     if (material.isNull())
     {
-      material = Ogre::MaterialManager::getSingleton().getByName("Gazebo/Red");
+      material = Ogre::MaterialManager::getSingleton().getByName("RVIZ/Red");
     }
 
     material->clone(cloned_name);


Property changes on: pkg/trunk/visualization_core/ogre_tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418


Property changes on: pkg/trunk/visualization_core/ogre_tools/media
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463


Property changes on: pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818


Property changes on: pkg/trunk/visualization_core/ogre_tools/test
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.