From f82d12d38188530267919516d7b17b57a594557f Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 22 Jul 2014 04:24:26 -0400 Subject: [PATCH] Fix linker errors on linux after merging Shyotl --- indra/newview/pipeline.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 28950e8f3..7af2dc21e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -249,12 +249,12 @@ void drawBoxOutline(const LLVector3& pos, const LLVector3& size); U32 nhpo2(U32 v); LLVertexBuffer* ll_create_cube_vb(U32 type_mask, U32 usage); -inline const LLMatrix4a& glh_get_current_modelview() +const LLMatrix4a& glh_get_current_modelview() { return gGLModelView; } -inline const LLMatrix4a& glh_get_current_projection() +const LLMatrix4a& glh_get_current_projection() { return gGLProjection; } @@ -269,12 +269,12 @@ inline const LLMatrix4a& glh_get_last_projection() return gGLLastProjection; } -inline void glh_set_current_modelview(const LLMatrix4a& mat) +void glh_set_current_modelview(const LLMatrix4a& mat) { gGLModelView = mat; } -inline void glh_set_current_projection(const LLMatrix4a& mat) +void glh_set_current_projection(const LLMatrix4a& mat) { gGLProjection = mat; }