diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index ead7a68374a4d847f84b913bd38b22cf74e0aefc..3943fee594e0302be7f7b59e69c93b876361fc67 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -515,8 +515,6 @@ S32 LLProfile::getNumNGonPoints(const LLProfileParams& params, S32 sides, F32 of t += t_step; } - t_fraction = (end - (t - t_step))*sides; - // Find the fraction that we need to add to the end point. t_fraction = (end - (t - t_step))*sides; if (t_fraction > 0.0001f) diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index ccf4f3ddf50e66928b9a7d42cff491fa71b1bac3..d72d6736614f0d8a33606640412befff8fcafe92 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -928,7 +928,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only } } llofstream file; - file.open(filename.c_str()); + file.open(filename); if (file.is_open()) { LLSDSerialize::toPrettyXML(settings, file); @@ -948,7 +948,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v { LLSD settings; llifstream infile; - infile.open(filename.c_str()); + infile.open(filename); if(!infile.is_open()) { LL_WARNS("Settings") << "Cannot find file " << filename << " to load." << LL_ENDL;