From fceae96eb171be0396512e251aab311d4e3ef9cc Mon Sep 17 00:00:00 2001 From: Karen Clark Date: Tue, 20 Mar 2007 22:21:42 +0000 Subject: svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release. --- indra/newview/llinventorymodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llinventorymodel.cpp') diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 2a686c46b9..b834845107 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1136,7 +1136,7 @@ void LLInventoryModel::cache( char inventory_filename[LL_MAX_PATH]; /*Flawfinder: ignore*/ agent_id.toString(agent_id_str); std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, agent_id_str)); - snprintf( /*Flawfinder: ignore*/ + snprintf( /* Flawfinder: ignore */ inventory_filename, LL_MAX_PATH, CACHE_FORMAT_STRING, @@ -1425,7 +1425,7 @@ bool LLInventoryModel::loadSkeleton( owner_id.toString(owner_id_str); std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, owner_id_str)); char inventory_filename[LL_MAX_PATH]; /*Flawfinder: ignore*/ - snprintf( /*Flawfinder: ignore*/ + snprintf( /* Flawfinder: ignore */ inventory_filename, LL_MAX_PATH, CACHE_FORMAT_STRING, -- cgit v1.2.3