From 6cfaecf97256d34f1bececd2d3826a958b6621a4 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Mon, 1 Aug 2011 20:42:06 +0200 Subject: [PATCH] GCC buildfixes --- indra/llprimitive/llmodel.cpp | 2 +- indra/llprimitive/llprimitive.h | 2 +- indra/newview/llagentui.cpp | 2 +- indra/newview/llselectmgr.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index a7563f17c..4ce0e0771 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1355,7 +1355,7 @@ LLModel* LLModel::loadModelFromDomMesh(domMesh *mesh) ret->mLabel = getElementLabel(mesh); return ret; } -#endif MESH_IMPORT +#endif //MESH_IMPORT std::string LLModel::getName() const { diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index c255655de..6c60e507d 100644 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -112,7 +112,7 @@ public: #if MESH_ENABLED PARAMS_RESERVED = 0x50, // Used on server-side PARAMS_MESH = 0x60, -#endif MESH_ENABLED +#endif //MESH_ENABLED }; public: diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp index 7f6875385..c0e1e6e68 100644 --- a/indra/newview/llagentui.cpp +++ b/indra/newview/llagentui.cpp @@ -49,7 +49,7 @@ void LLAgentUI::buildFullname(std::string& name) /* //static -void LLAgentUI::buildSLURL(LLSLURL& slurl, const bool escaped /*= true*//*) +void LLAgentUI::buildSLURL(LLSLURL& slurl, const bool escaped /= true/ ) { LLSLURL return_slurl; LLViewerRegion *regionp = gAgent.getRegion(); diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index dadd29dbd..6246c7ebe 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5678,7 +5678,7 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); gGL.popMatrix(); } -#endif MESH_ENABLED +#endif //MESH_ENABLED //----------------------------------------------------------------------------- // renderOneSilhouette()