From 7e012ccfc43b7d7e795ec341359dfef1d423e2e3 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 11 Dec 2003 23:33:27 +0000
Subject: [PATCH] Renamed PermissableOptions to setPermissableOptimizations.

---
 include/osgUtil/Optimizer | 20 ++++++++++----------
 src/osgUtil/Optimizer.cpp |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer
index ab904104d..df8b0f912 100644
--- a/include/osgUtil/Optimizer
+++ b/include/osgUtil/Optimizer
@@ -77,32 +77,32 @@ class OSGUTIL_EXPORT Optimizer
         virtual void optimize(osg::Node* node, unsigned int options);
 
 
-        inline void setPermissableOptionsForObject(const osg::Object* object, unsigned int options)
+        inline void setPermissableOptimizationsForObject(const osg::Object* object, unsigned int options)
         {
-            _permissableOptionsMap[object] = options;
+            _permissableOptimizationsMap[object] = options;
         }
         
-        inline unsigned int getPermissableOptionsForObject(const osg::Object* object) const
+        inline unsigned int getPermissableOptimizationsForObject(const osg::Object* object) const
         {
-            PermissableOptionsMap::const_iterator itr = _permissableOptionsMap.find(object);
-            if (itr!=_permissableOptionsMap.end()) return itr->second;
+            PermissableOptimizationsMap::const_iterator itr = _permissableOptimizationsMap.find(object);
+            if (itr!=_permissableOptimizationsMap.end()) return itr->second;
             else return 0xffffffff;
         }
         
         inline bool isOperationPermissableForObject(const osg::Object* object,unsigned int option) const
         {
-            return (option & getPermissableOptionsForObject(object))!=0; 
+            return (option & getPermissableOptimizationsForObject(object))!=0; 
         }
         
-        typedef std::map<const osg::Object*,unsigned int> PermissableOptionsMap;
+        typedef std::map<const osg::Object*,unsigned int> PermissableOptimizationsMap;
 
-        PermissableOptionsMap& getPrimissableOptionsMap() { return _permissableOptionsMap; }
-        const PermissableOptionsMap& getPrimissableOptionsMap() const { return _permissableOptionsMap; }
+        PermissableOptimizationsMap& getPrimissableOptionsMap() { return _permissableOptimizationsMap; }
+        const PermissableOptimizationsMap& getPrimissableOptionsMap() const { return _permissableOptimizationsMap; }
         
         
     protected:
     
-        PermissableOptionsMap _permissableOptionsMap;
+        PermissableOptimizationsMap _permissableOptimizationsMap;
 
 
     public:
diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp
index 04401e6b5..1d5d42c21 100644
--- a/src/osgUtil/Optimizer.cpp
+++ b/src/osgUtil/Optimizer.cpp
@@ -52,7 +52,7 @@ static bool isNodeEmpty(const osg::Node& node)
 
 void Optimizer::reset()
 {
-    _permissableOptionsMap.clear();
+    _permissableOptimizationsMap.clear();
 }
 
 static osg::ApplicationUsageProxy Optimizer_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_OPTIMIZER \"<type> [<type>]\"","DEFAULT | FLATTEN_STATIC_TRANSFORMS | REMOVE_REDUNDANT_NODES | COMBINE_ADJACENT_LODS | SHARE_DUPLICATE_STATE | MERGE_GEOMETRY | SPATIALIZE_GROUPS  | COPY_SHARED_NODES  | TRISTRIP_GEOMETRY");