GCC buildfixes
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user