summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r--indra/newview/pipeline.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 62eba72e81..1d2033b4f0 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -277,7 +277,7 @@ public:
void stateSort(LLCamera& camera, LLCullResult& result);
void stateSort(LLSpatialGroup* group, LLCamera& camera);
- void stateSort(LLSpatialBridge* bridge, LLCamera& camera, BOOL fov_changed = FALSE);
+ void stateSort(LLSpatialBridge* bridge, LLCamera& camera, bool fov_changed = false);
void stateSort(LLDrawable* drawablep, LLCamera& camera);
void postSort(LLCamera& camera);
@@ -351,7 +351,7 @@ public:
void findReferences(LLDrawable *drawablep); // Find the lists which have references to this object
bool verify(); // Verify that all data in the pipeline is "correct"
- S32 getLightCount() const { return mLights.size(); }
+ S32 getLightCount() const { return static_cast<S32>(mLights.size()); }
void calcNearbyLights(LLCamera& camera);
void setupHWLights();