summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep <none@none>2012-05-01 14:10:52 -0400
committerprep <none@none>2012-05-01 14:10:52 -0400
commit3c18573ed0278b420e06b1c2ce5fc19232332aba (patch)
tree604b54f27b43105b1be88d75d93ea181b85cfd1b /indra
parent87cba5a2b2ff662cb1b4d847b1ca3030ad53c960 (diff)
Made restorePermanentObjects() api const correct.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/pipeline.cpp6
-rw-r--r--indra/newview/pipeline.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index e7123e24d2..7299f73add 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -10140,12 +10140,12 @@ void LLPipeline::hidePermanentObjects( std::vector<U32>& restoreList )
}
}
-void LLPipeline::restorePermanentObjects( std::vector<U32>& restoreList )
+void LLPipeline::restorePermanentObjects( const std::vector<U32>& restoreList )
{
//This method is used to restore(unhide) any vo's from the object list that may have
//been hidden because their permanency flag was set.
- std::vector<U32>::iterator itCurrent = restoreList.begin();
- std::vector<U32>::iterator itEnd = restoreList.end();
+ std::vector<U32>::const_iterator itCurrent = restoreList.begin();
+ std::vector<U32>::const_iterator itEnd = restoreList.end();
while ( itCurrent != itEnd )
{
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 5995fc0e5b..a4ab1fa56b 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -367,7 +367,7 @@ public:
void addDebugBlip(const LLVector3& position, const LLColor4& color);
void hidePermanentObjects( std::vector<U32>& restoreList );
- void restorePermanentObjects( std::vector<U32>& restoreList );
+ void restorePermanentObjects( const std::vector<U32>& restoreList );
private:
void unloadShaders();